Fork of git SCM with my patches. http://git.kilabit.info/git/atom?h=v2.0.0-rc4 2014-05-20T21:51:11Z 2014-05-20T21:51:11Z Junio C Hamano gitster@pobox.com 2014-05-20T19:07:35Z urn:sha1:8ced8e40ac07c1b13b2edbb459d37b9b2d7275d6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-20T21:51:06Z Jason St. John jstjohn@purdue.edu 2014-05-17T03:30:34Z urn:sha1:3054c66bd465175656ab16c0fa9de79284898223 Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-20T21:48:11Z Junio C Hamano gitster@pobox.com 2014-05-20T21:18:11Z urn:sha1:b2c851a8e67da752d8a5dbde5a9dae6e3428a4c9 Instead of showing a warning and working as before, fail and show the message and force immediate upgrade from their upstream repositories when these tools are run, per request from their primary author. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-20T00:12:36Z Junio C Hamano gitster@pobox.com 2014-05-20T00:12:36Z urn:sha1:00a5b79466f79a2df6e0f42806adefbe4891c40b * 'jc/graduate-remote-hg-bzr' (early part): remote-helpers: point at their upstream repositories contrib: remote-helpers: add move warnings (v2.0) Revert "Merge branch 'fc/transport-helper-sync-error-fix'" 2014-05-20T00:10:03Z Junio C Hamano gitster@pobox.com 2014-05-15T21:58:16Z urn:sha1:896ba14d653c43bd7a43b6b291e941ab60855c04 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-20T00:10:03Z Felipe Contreras felipe.contreras@gmail.com 2014-05-13T21:29:56Z urn:sha1:03110863517c4a7aa37a10f14a9ad8be49eeca59 The tools are now maintained out-of-tree, and they have a regression in v2.0. It's better to start warning the users as soon as possible. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-20T00:09:57Z Junio C Hamano gitster@pobox.com 2014-05-14T19:06:35Z urn:sha1:10e1feebb454d99eb6644cc53b94255f40e6fe9c This reverts commit d508e4a8e2391ae2596403b6478d01cf3d5f928f, reversing changes made to e42552135a2a396f37053a89f44952ea907870b2. The author of the original topic says he broke the upcoming 2.0 release with something that relates to "synchronization crash regression" while refusing to give further specifics, so this would unfortunately be the safest option for the upcoming release. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-19T23:10:10Z Junio C Hamano gitster@pobox.com 2014-05-19T23:10:10Z urn:sha1:df43b41afcc9bf5e4b8751dc9a53b068b33f52a8 * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1 2014-05-19T23:09:53Z Richard Hansen rhansen@bbn.com 2014-05-19T22:55:37Z urn:sha1:1e4119c81b3e203e1729e03be6e4a53eb9207f5c Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500 ("git-prompt.sh: don't put unsanitized branch names in $PS1"): zsh does not expand PS1 by default, but that commit assumed it did. The bug resulted in prompts containing the literal string '${__git_ps1_branch_name}' instead of the actual branch name. Reported-by: Caleb Thompson <caleb@calebthompson.io> Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-19T17:35:36Z Junio C Hamano gitster@pobox.com 2014-05-19T17:35:36Z urn:sha1:7dde48ea7aa18de1174628e21510967b0ad71d7c * lt/request-pull: request-pull: resurrect for-linus -> tags/for-linus DWIM