Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.0.2 2014-05-27T19:27:50Z 2014-05-27T19:27:50Z John Keeping john@keeping.me.uk 2014-05-22T13:58:38Z urn:sha1:8fee8726470bd63db6c396ea6208ea487eaa8fab The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev <hkdobrev@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-05-27T19:27:36Z John Keeping john@keeping.me.uk 2014-05-22T13:58:37Z urn:sha1:6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). Signed-off-by: John Keeping <john@keeping.me.uk> 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-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-13T18:53:14Z Junio C Hamano gitster@pobox.com 2014-05-13T18:53:14Z urn:sha1:6308767f0bb58116cb405e1f4f77f5dfc1589920 * fc/prompt-zsh-read-from-file: contrib: completion: fix 'eread()' namespace 2014-05-13T18:52:51Z Felipe Contreras felipe.contreras@gmail.com 2014-05-13T13:21:19Z urn:sha1:66ab301c165b5ba6395b7bcc7cf35a7592f9f46f Otherwise it might collide with a function of the same name in the user's environment. Suggested-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>