{"thread":{"id":"34884","subject":"[PATCH v3 0/5] Preparation for non-ff pulls by default","startedAt":"2013-09-09T01:23:11Z","lastAt":"2013-10-12T06:21:28Z","messageCount":24,"participants":["Felipe Contreras","Richard Hansen","Jeff King","Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":5},"messages":[{"id":"227182","messageId":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":null,"subject":"[PATCH v3 0/5] Preparation for non-ff pulls by default","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:11Z","receivedAt":"2013-09-09T01:23:11Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"It is very typical for Git newcomers to inadvertently create merges and worst:\ninadvertently pushing them. This is one of the reasons many experienced users\nprefer to avoid 'git pull', and recommend newcomers to avoid it as well.\n\nTo avoid these problems and keep 'git pull' useful, it has been suggested\nthat 'git pull' barfs by default if the merge is non-fast-forward, which\nunfortunately would break backwards compatibility.\n\nThis patch series leaves everything in place to enable this new mode, but it\nonly gets enabled if the user specifically configures it; pull.mode =\nmerge-ff-only.\n\nLater on this mode can be enabled by default (e.g. in v2.0).\n\nTo achieve that first some configurations are renamed: for example: pull.rebase\n=> pull.mode = rebase, but the old ones remain functional, thus there are no\nfunctional changes.\n\nThen the new mode 'merge-ff-only' is added, but not enabled by default, and\nfinally, a warning is added so the users will know what to do when the new\nmode is indeed enabled by default.\n\nFelipe Contreras (5):\n pull: rename pull.rename to pull.mode\n pull: refactor $rebase variable into $mode\n pull: add --merge option\n pull: add merge-ff-only option\n pull: add warning on non-ff merges\n\n Documentation/config.txt | 24 ++++++++++--------\n Documentation/git-pull.txt | 10 +++++---\n branch.c | 4 +--\n git-pull.sh | 63 +++++++++++++++++++++++++++++++++++++---------\n t/t3200-branch.sh | 40 ++++++++++++++---------------\n t/t5520-pull.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++\n t/t5601-clone.sh | 4 +--\n 7 files changed, 157 insertions(+), 50 deletions(-)\n\n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227186","messageId":"1378689796-19305-2-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:12Z","receivedAt":"2013-09-09T01:23:12Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Also 'branch..rebase' to 'branch..pullmode'.\n\nThis way 'pull.mode' can be set to 'merge', and the default can be\nsomething else.\n\nThe old configurations still work, but get deprecated.\n\nSigned-off-by: Felipe Contreras \n---\n Documentation/config.txt | 22 +++++++++++-----------\n Documentation/git-pull.txt | 2 +-\n branch.c | 4 ++--\n git-pull.sh | 18 ++++++++++++++++--\n t/t3200-branch.sh | 40 ++++++++++++++++++++--------------------\n t/t5520-pull.sh | 26 ++++++++++++++++++++++++++\n t/t5601-clone.sh | 4 ++--\n 7 files changed, 78 insertions(+), 38 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex ec57a15..9489a59 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -706,7 +706,7 @@ branch.autosetupmerge::\n branch.autosetuprebase::\n \tWhen a new branch is created with 'git branch' or 'git checkout'\n \tthat tracks another branch, this variable tells Git to set\n-\tup pull to rebase instead of merge (see \"branch..rebase\").\n+\tup pull to rebase instead of merge (see \"branch..pullmode\").\n \tWhen `never`, rebase is never automatically set to true.\n \tWhen `local`, rebase is set to true for tracked branches of\n \tother local branches.\n@@ -760,11 +760,11 @@ branch..mergeoptions::\n \toption values containing whitespace characters are currently not\n \tsupported.\n \n-branch..rebase::\n-\tWhen true, rebase the branch on top of the fetched branch,\n-\tinstead of merging the default branch from the default remote when\n-\t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n-\tbranch-specific manner.\n+branch..pullmode::\n+\tWhen \"git pull\" is run, this determines if it would either merge or\n+\trebase the fetched branch. The possible values are 'merge' and\n+\t'rebase'. See \"pull.mode\" for doing this in a non branch-specific\n+\tmanner.\n +\n *NOTE*: this is a possibly dangerous operation; do *not* use\n it unless you understand the implications (see linkgit:git-rebase[1]\n@@ -1820,11 +1820,11 @@ pretty.::\n \tNote that an alias with the same name as a built-in format\n \twill be silently ignored.\n \n-pull.rebase::\n-\tWhen true, rebase branches on top of the fetched branch, instead\n-\tof merging the default branch from the default remote when \"git\n-\tpull\" is run. See \"branch..rebase\" for setting this on a\n-\tper-branch basis.\n+pull.mode::\n+\tWhen \"git pull\" is run, this determines if it would either merge or\n+\trebase the fetched branch. The possible values are 'merge' and\n+\t'rebase'. See \"branch..pullmode\" for doing this in a non\n+\tbranch-specific manner.\n +\n *NOTE*: this is a possibly dangerous operation; do *not* use\n it unless you understand the implications (see linkgit:git-rebase[1]\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 6ef8d59..991352f 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -109,7 +109,7 @@ include::merge-options.txt[]\n \tfetched, the rebase uses that information to avoid rebasing\n \tnon-local changes.\n +\n-See `pull.rebase`, `branch..rebase` and `branch.autosetuprebase` in\n+See `pull.mode`, `branch..pullmode` and `branch.autosetuprebase` in\n linkgit:git-config[1] if you want to make `git pull` always use\n `--rebase` instead of merging.\n +\ndiff --git a/branch.c b/branch.c\nindex c5c6984..c6b70c2 100644\n--- a/branch.c\n+++ b/branch.c\n@@ -71,8 +71,8 @@ void install_branch_config(int flag, const char *local, const char *origin, cons\n \n \tif (rebasing) {\n \t\tstrbuf_reset(&key);\n-\t\tstrbuf_addf(&key, \"branch.%s.rebase\", local);\n-\t\tgit_config_set(key.buf, \"true\");\n+\t\tstrbuf_addf(&key, \"branch.%s.pullmode\", local);\n+\t\tgit_config_set(key.buf, \"rebase\");\n \t}\n \tstrbuf_release(&key);\n \ndiff --git a/git-pull.sh b/git-pull.sh\nindex f0df41c..de57c1d 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -43,10 +43,24 @@ log_arg= verbosity= progress= recurse_submodules= verify_signatures=\n merge_args= edit=\n curr_branch=$(git symbolic-ref -q HEAD)\n curr_branch_short=\"${curr_branch#refs/heads/}\"\n-rebase=$(git config --bool branch.$curr_branch_short.rebase)\n+mode=$(git config branch.${curr_branch_short}.pullmode)\n+if test -z \"$mode\"\n+then\n+\tmode=$(git config pull.mode)\n+fi\n+test \"$mode\" == 'rebase' && rebase=\"true\"\n if test -z \"$rebase\"\n then\n-\trebase=$(git config --bool pull.rebase)\n+\trebase=$(git config --bool branch.$curr_branch_short.rebase)\n+\tif test -z \"$rebase\"\n+\tthen\n+\t\trebase=$(git config --bool pull.rebase)\n+\tfi\n+\tif test \"$rebase\" = 'true'\n+\tthen\n+\t\techo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n+\t\techo \"Please use pull.mode and branch..pullmode instead.\"\n+\tfi\n fi\n dry_run=\n while :\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 44ec6a4..b620798 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -557,7 +557,7 @@ test_expect_success 'autosetuprebase local on a tracked local branch' '\n \tgit branch --track myr1 mybase &&\n \ttest \"$(git config branch.myr1.remote)\" = . &&\n \ttest \"$(git config branch.myr1.merge)\" = refs/heads/mybase &&\n-\ttest \"$(git config branch.myr1.rebase)\" = true\n+\ttest \"$(git config branch.myr1.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase always on a tracked local branch' '\n@@ -569,7 +569,7 @@ test_expect_success 'autosetuprebase always on a tracked local branch' '\n \tgit branch --track myr2 mybase &&\n \ttest \"$(git config branch.myr2.remote)\" = . &&\n \ttest \"$(git config branch.myr2.merge)\" = refs/heads/mybase &&\n-\ttest \"$(git config branch.myr2.rebase)\" = true\n+\ttest \"$(git config branch.myr2.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase remote on a tracked local branch' '\n@@ -581,7 +581,7 @@ test_expect_success 'autosetuprebase remote on a tracked local branch' '\n \tgit branch --track myr3 mybase2 &&\n \ttest \"$(git config branch.myr3.remote)\" = . &&\n \ttest \"$(git config branch.myr3.merge)\" = refs/heads/mybase2 &&\n-\t! test \"$(git config branch.myr3.rebase)\" = true\n+\t! test \"$(git config branch.myr3.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase never on a tracked local branch' '\n@@ -593,7 +593,7 @@ test_expect_success 'autosetuprebase never on a tracked local branch' '\n \tgit branch --track myr4 mybase2 &&\n \ttest \"$(git config branch.myr4.remote)\" = . &&\n \ttest \"$(git config branch.myr4.merge)\" = refs/heads/mybase2 &&\n-\t! test \"$(git config branch.myr4.rebase)\" = true\n+\t! test \"$(git config branch.myr4.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase local on a tracked remote branch' '\n@@ -604,7 +604,7 @@ test_expect_success 'autosetuprebase local on a tracked remote branch' '\n \tgit branch --track myr5 local/master &&\n \ttest \"$(git config branch.myr5.remote)\" = local &&\n \ttest \"$(git config branch.myr5.merge)\" = refs/heads/master &&\n-\t! test \"$(git config branch.myr5.rebase)\" = true\n+\t! test \"$(git config branch.myr5.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase never on a tracked remote branch' '\n@@ -615,7 +615,7 @@ test_expect_success 'autosetuprebase never on a tracked remote branch' '\n \tgit branch --track myr6 local/master &&\n \ttest \"$(git config branch.myr6.remote)\" = local &&\n \ttest \"$(git config branch.myr6.merge)\" = refs/heads/master &&\n-\t! test \"$(git config branch.myr6.rebase)\" = true\n+\t! test \"$(git config branch.myr6.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase remote on a tracked remote branch' '\n@@ -626,7 +626,7 @@ test_expect_success 'autosetuprebase remote on a tracked remote branch' '\n \tgit branch --track myr7 local/master &&\n \ttest \"$(git config branch.myr7.remote)\" = local &&\n \ttest \"$(git config branch.myr7.merge)\" = refs/heads/master &&\n-\ttest \"$(git config branch.myr7.rebase)\" = true\n+\ttest \"$(git config branch.myr7.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase always on a tracked remote branch' '\n@@ -637,7 +637,7 @@ test_expect_success 'autosetuprebase always on a tracked remote branch' '\n \tgit branch --track myr8 local/master &&\n \ttest \"$(git config branch.myr8.remote)\" = local &&\n \ttest \"$(git config branch.myr8.merge)\" = refs/heads/master &&\n-\ttest \"$(git config branch.myr8.rebase)\" = true\n+\ttest \"$(git config branch.myr8.pullmode)\" = rebase\n '\n \n test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '\n@@ -648,7 +648,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '\n \tgit branch --track myr9 local/master &&\n \ttest \"$(git config branch.myr9.remote)\" = local &&\n \ttest \"$(git config branch.myr9.merge)\" = refs/heads/master &&\n-\ttest \"z$(git config branch.myr9.rebase)\" = z\n+\ttest \"z$(git config branch.myr9.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '\n@@ -659,7 +659,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '\n \tgit branch --track myr10 mybase2 &&\n \ttest \"$(git config branch.myr10.remote)\" = . &&\n \ttest \"$(git config branch.myr10.merge)\" = refs/heads/mybase2 &&\n-\ttest \"z$(git config branch.myr10.rebase)\" = z\n+\ttest \"z$(git config branch.myr10.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase unconfigured on untracked local branch' '\n@@ -669,7 +669,7 @@ test_expect_success 'autosetuprebase unconfigured on untracked local branch' '\n \tgit branch --no-track myr11 mybase2 &&\n \ttest \"z$(git config branch.myr11.remote)\" = z &&\n \ttest \"z$(git config branch.myr11.merge)\" = z &&\n-\ttest \"z$(git config branch.myr11.rebase)\" = z\n+\ttest \"z$(git config branch.myr11.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '\n@@ -679,7 +679,7 @@ test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '\n \tgit branch --no-track myr12 local/master &&\n \ttest \"z$(git config branch.myr12.remote)\" = z &&\n \ttest \"z$(git config branch.myr12.merge)\" = z &&\n-\ttest \"z$(git config branch.myr12.rebase)\" = z\n+\ttest \"z$(git config branch.myr12.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase never on an untracked local branch' '\n@@ -690,7 +690,7 @@ test_expect_success 'autosetuprebase never on an untracked local branch' '\n \tgit branch --no-track myr13 mybase2 &&\n \ttest \"z$(git config branch.myr13.remote)\" = z &&\n \ttest \"z$(git config branch.myr13.merge)\" = z &&\n-\ttest \"z$(git config branch.myr13.rebase)\" = z\n+\ttest \"z$(git config branch.myr13.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase local on an untracked local branch' '\n@@ -701,7 +701,7 @@ test_expect_success 'autosetuprebase local on an untracked local branch' '\n \tgit branch --no-track myr14 mybase2 &&\n \ttest \"z$(git config branch.myr14.remote)\" = z &&\n \ttest \"z$(git config branch.myr14.merge)\" = z &&\n-\ttest \"z$(git config branch.myr14.rebase)\" = z\n+\ttest \"z$(git config branch.myr14.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase remote on an untracked local branch' '\n@@ -712,7 +712,7 @@ test_expect_success 'autosetuprebase remote on an untracked local branch' '\n \tgit branch --no-track myr15 mybase2 &&\n \ttest \"z$(git config branch.myr15.remote)\" = z &&\n \ttest \"z$(git config branch.myr15.merge)\" = z &&\n-\ttest \"z$(git config branch.myr15.rebase)\" = z\n+\ttest \"z$(git config branch.myr15.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase always on an untracked local branch' '\n@@ -723,7 +723,7 @@ test_expect_success 'autosetuprebase always on an untracked local branch' '\n \tgit branch --no-track myr16 mybase2 &&\n \ttest \"z$(git config branch.myr16.remote)\" = z &&\n \ttest \"z$(git config branch.myr16.merge)\" = z &&\n-\ttest \"z$(git config branch.myr16.rebase)\" = z\n+\ttest \"z$(git config branch.myr16.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase never on an untracked remote branch' '\n@@ -734,7 +734,7 @@ test_expect_success 'autosetuprebase never on an untracked remote branch' '\n \tgit branch --no-track myr17 local/master &&\n \ttest \"z$(git config branch.myr17.remote)\" = z &&\n \ttest \"z$(git config branch.myr17.merge)\" = z &&\n-\ttest \"z$(git config branch.myr17.rebase)\" = z\n+\ttest \"z$(git config branch.myr17.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase local on an untracked remote branch' '\n@@ -745,7 +745,7 @@ test_expect_success 'autosetuprebase local on an untracked remote branch' '\n \tgit branch --no-track myr18 local/master &&\n \ttest \"z$(git config branch.myr18.remote)\" = z &&\n \ttest \"z$(git config branch.myr18.merge)\" = z &&\n-\ttest \"z$(git config branch.myr18.rebase)\" = z\n+\ttest \"z$(git config branch.myr18.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase remote on an untracked remote branch' '\n@@ -756,7 +756,7 @@ test_expect_success 'autosetuprebase remote on an untracked remote branch' '\n \tgit branch --no-track myr19 local/master &&\n \ttest \"z$(git config branch.myr19.remote)\" = z &&\n \ttest \"z$(git config branch.myr19.merge)\" = z &&\n-\ttest \"z$(git config branch.myr19.rebase)\" = z\n+\ttest \"z$(git config branch.myr19.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase always on an untracked remote branch' '\n@@ -767,7 +767,7 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' '\n \tgit branch --no-track myr20 local/master &&\n \ttest \"z$(git config branch.myr20.remote)\" = z &&\n \ttest \"z$(git config branch.myr20.merge)\" = z &&\n-\ttest \"z$(git config branch.myr20.rebase)\" = z\n+\ttest \"z$(git config branch.myr20.pullmode)\" = z\n '\n \n test_expect_success 'autosetuprebase always on detached HEAD' '\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex ed4d9c8..978a3c1 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -284,4 +284,30 @@ test_expect_success 'git pull --rebase against local branch' '\n \ttest file = \"$(cat file2)\"\n '\n \n+test_expect_success 'pull.mode' '\n+\tgit checkout to-rebase &&\n+\tgit reset --hard before-rebase &&\n+\ttest_config pull.mode rebase &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n+\n+test_expect_success 'branch.to-rebase.pullmode' '\n+\tgit reset --hard before-rebase &&\n+\ttest_config branch.to-rebase.pullmode rebase &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n+\n+test_expect_success 'branch.to-rebase.pullmode should override pull.mode' '\n+\tgit reset --hard before-rebase &&\n+\ttest_config pull.mode rebase &&\n+\ttest_config branch.to-rebase.pullmode merge &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) != $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n+\n test_done\ndiff --git a/t/t5601-clone.sh b/t/t5601-clone.sh\nindex 0629149..6c888ae 100755\n--- a/t/t5601-clone.sh\n+++ b/t/t5601-clone.sh\n@@ -191,8 +191,8 @@ test_expect_success 'clone respects global branch.autosetuprebase' '\n \t\trm -fr dst &&\n \t\tgit clone src dst &&\n \t\tcd dst &&\n-\t\tactual=\"z$(git config branch.master.rebase)\" &&\n-\t\ttest ztrue = $actual\n+\t\tactual=\"$(git config branch.master.pullmode)\" &&\n+\t\ttest \"$actual\" = rebase\n \t)\n '\n \n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227184","messageId":"1378689796-19305-3-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 2/5] pull: refactor $rebase variable into $mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:13Z","receivedAt":"2013-09-09T01:23:13Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n git-pull.sh | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex de57c1d..f53d193 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -48,8 +48,7 @@ if test -z \"$mode\"\n then\n \tmode=$(git config pull.mode)\n fi\n-test \"$mode\" == 'rebase' && rebase=\"true\"\n-if test -z \"$rebase\"\n+if test -z \"$mode\"\n then\n \trebase=$(git config --bool branch.$curr_branch_short.rebase)\n \tif test -z \"$rebase\"\n@@ -58,6 +57,7 @@ then\n \tfi\n \tif test \"$rebase\" = 'true'\n \tthen\n+\t\tmode=\"rebase\"\n \t\techo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n \t\techo \"Please use pull.mode and branch..pullmode instead.\"\n \tfi\n@@ -125,10 +125,10 @@ do\n \t\tmerge_args=\"$merge_args$xx \"\n \t\t;;\n \t-r|--r|--re|--reb|--reba|--rebas|--rebase)\n-\t\trebase=true\n+\t\tmode=rebase\n \t\t;;\n \t--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)\n-\t\trebase=false\n+\t\tmode=\n \t\t;;\n \t--recurse-submodules)\n \t\trecurse_submodules=--recurse-submodules\n@@ -171,7 +171,7 @@ error_on_no_merge_candidates () {\n \t\tesac\n \tdone\n \n-\tif test true = \"$rebase\"\n+\tif test \"$mode\" = rebase\n \tthen\n \t\top_type=rebase\n \t\top_prep=against\n@@ -185,7 +185,7 @@ error_on_no_merge_candidates () {\n \tremote=$(git config \"branch.$curr_branch.remote\")\n \n \tif [ $# -gt 1 ]; then\n-\t\tif [ \"$rebase\" = true ]; then\n+\t\tif [ \"$mode\" = rebase ]; then\n \t\t\tprintf \"There is no candidate for rebasing against \"\n \t\telse\n \t\t\tprintf \"There are no candidates for merging \"\n@@ -208,7 +208,7 @@ error_on_no_merge_candidates () {\n \texit 1\n }\n \n-test true = \"$rebase\" && {\n+test \"$mode\" = rebase && {\n \tif ! git rev-parse -q --verify HEAD >/dev/null\n \tthen\n \t\t# On an unborn branch\n@@ -273,7 +273,7 @@ case \"$merge_head\" in\n \tthen\n \t\tdie \"$(gettext \"Cannot merge multiple branches into empty head\")\"\n \tfi\n-\tif test true = \"$rebase\"\n+\tif test \"$mode\" = rebase\n \tthen\n \t\tdie \"$(gettext \"Cannot rebase onto multiple branches\")\"\n \tfi\n@@ -294,7 +294,7 @@ then\n \texit\n fi\n \n-if test true = \"$rebase\"\n+if test \"$mode\" = rebase\n then\n \to=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)\n \tif test \"$oldremoteref\" = \"$o\"\n@@ -304,8 +304,8 @@ then\n fi\n \n merge_name=$(git fmt-merge-msg $log_arg <\"$GIT_DIR/FETCH_HEAD\") || exit\n-case \"$rebase\" in\n-true)\n+case \"$mode\" in\n+rebase)\n \teval=\"git-rebase $diffstat $strategy_args $merge_args $verbosity\"\n \teval=\"$eval --onto $merge_head ${oldremoteref:-$merge_head}\"\n \t;;\n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227185","messageId":"1378689796-19305-4-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 3/5] pull: add --merge option","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:14Z","receivedAt":"2013-09-09T01:23:14Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Also, deprecate --no-rebase since there's no need for it any more.\n\nSigned-off-by: Felipe Contreras \n---\n Documentation/git-pull.txt | 8 ++++++--\n git-pull.sh | 6 +++++-\n 2 files changed, 11 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 991352f..e09f004 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -119,8 +119,12 @@ It rewrites history, which does not bode well when you\n published that history already. Do *not* use this option\n unless you have read linkgit:git-rebase[1] carefully.\n \n---no-rebase::\n-\tOverride earlier --rebase.\n+-m::\n+--merge::\n+\tForce a merge.\n++\n+See `pull.mode`, `branch..pullmode` in linkgit:git-config[1] if you want\n+to make `git pull` always use `--merge`.\n \n Options related to fetching\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~\ndiff --git a/git-pull.sh b/git-pull.sh\nindex f53d193..fbb8a9b 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -127,8 +127,12 @@ do\n \t-r|--r|--re|--reb|--reba|--rebas|--rebase)\n \t\tmode=rebase\n \t\t;;\n+\t-m|--m|--me|--mer|--merg|--merge)\n+\t\tmode=merge\n+\t\t;;\n \t--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)\n-\t\tmode=\n+\t\tmode=merge\n+\t\techo \"--no-rebase is deprecated, please use --merge instead\"\n \t\t;;\n \t--recurse-submodules)\n \t\trecurse_submodules=--recurse-submodules\n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227183","messageId":"1378689796-19305-5-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 4/5] pull: add merge-ff-only option","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:15Z","receivedAt":"2013-09-09T01:23:15Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"It is very typical for Git newcomers to inadvertently create merges and\nworst; inadvertently pushing them. This is one of the reasons many\nexperienced users prefer to avoid 'git pull', and recommend newcomers to\navoid it as well.\n\nTo avoid these problems and keep 'git pull' useful, it has been\nsuggested that 'git pull' barfs by default if the merge is\nnon-fast-forward, which unfortunately would break backwards\ncompatibility.\n\nThis patch leaves everything in place to enable this new mode, but it\nonly gets enabled if the user specifically configures it; pull.mode =\nmerge-ff-only.\n\nLater on this mode can be enabled by default (e.g. in v2.0).\n\nFor the full discussion you can read:\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/225146/focus=225305\n\nSigned-off-by: Felipe Contreras \n---\n Documentation/config.txt | 8 +++++---\n git-pull.sh | 12 ++++++++++++\n t/t5520-pull.sh | 36 ++++++++++++++++++++++++++++++++++++\n 3 files changed, 53 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 9489a59..13635e0 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1822,9 +1822,11 @@ pretty.::\n \n pull.mode::\n \tWhen \"git pull\" is run, this determines if it would either merge or\n-\trebase the fetched branch. The possible values are 'merge' and\n-\t'rebase'. See \"branch..pullmode\" for doing this in a non\n-\tbranch-specific manner.\n+\trebase the fetched branch. The possible values are 'merge',\n+\t'rebase', and 'merge-ff-only'. If 'merge-ff-only' is specified, the\n+\tmerge will only succeed if it's fast-forward. See\n+\t\"branch..pullmode\" for doing this in a non branch-specific\n+\tmanner.\n +\n *NOTE*: this is a possibly dangerous operation; do *not* use\n it unless you understand the implications (see linkgit:git-rebase[1]\ndiff --git a/git-pull.sh b/git-pull.sh\nindex fbb8a9b..580d633 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -62,6 +62,7 @@ then\n \t\techo \"Please use pull.mode and branch..pullmode instead.\"\n \tfi\n fi\n+test -z \"$mode\" && mode=merge\n dry_run=\n while :\n do\n@@ -282,6 +283,17 @@ case \"$merge_head\" in\n \t\tdie \"$(gettext \"Cannot rebase onto multiple branches\")\"\n \tfi\n \t;;\n+*)\n+\t# check if a non-fast-foward merge would be needed\n+\tmerge_head=${merge_head% }\n+\tif test \"$mode\" = merge-ff-only -a -z \"$no_ff$ff_only${squash#--no-squash}\" &&\n+\t\ttest -n \"$orig_head\" &&\n+\t\t! git merge-base --is-ancestor \"$orig_head\" \"$merge_head\" &&\n+\t\t! git merge-base --is-ancestor \"$merge_head\" \"$orig_head\"\n+\tthen\n+\t\tdie \"The pull was not fast-forward, please either merge or rebase.\"\n+\tfi\n+\t;;\n esac\n \n # Pulling into unborn branch: a shorthand for branching off\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 978a3c1..798ae2f 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -310,4 +310,40 @@ test_expect_success 'branch.to-rebase.pullmode should override pull.mode' '\n \ttest new = $(git show HEAD:file2)\n '\n \n+test_expect_success 'git pull fast-forward' '\n+\ttest_when_finished \"git checkout master && git branch -D other test\" &&\n+\ttest_config pull.mode merge-ff-only &&\n+\tgit checkout -b other master &&\n+\t>new &&\n+\tgit add new &&\n+\tgit commit -m new &&\n+\tgit checkout -b test -t other &&\n+\tgit reset --hard master &&\n+\tgit pull\n+'\n+\n+test_expect_success 'git pull non-fast-forward' '\n+\ttest_when_finished \"git checkout master && git branch -D other test\" &&\n+\ttest_config pull.mode merge-ff-only &&\n+\tgit checkout -b other master^ &&\n+\t>new &&\n+\tgit add new &&\n+\tgit commit -m new &&\n+\tgit checkout -b test -t other &&\n+\tgit reset --hard master &&\n+\ttest_must_fail git pull\n+'\n+\n+test_expect_success 'git pull non-fast-forward (merge)' '\n+\ttest_when_finished \"git checkout master && git branch -D other test\" &&\n+\ttest_config pull.mode merge-ff-only &&\n+\tgit checkout -b other master^ &&\n+\t>new &&\n+\tgit add new &&\n+\tgit commit -m new &&\n+\tgit checkout -b test -t other &&\n+\tgit reset --hard master &&\n+\tgit pull --merge\n+'\n+\n test_done\n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227187","messageId":"1378689796-19305-6-git-send-email-felipe.contreras@gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 5/5] pull: add warning on non-ff merges","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:23:16Z","receivedAt":"2013-09-09T01:23:16Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"To prepare our uses for the upcoming changes we should warn them and let\nthem know that they will need to specify a merge or a rebase in the\nfuture (when a non-fast-forward situation arises). Also, let them know\nwe fallback to 'git pull --merge', so when the obsoletion of this mode\ncomes, they know what to type without interrupting or changing their\nworkflow.\n\nSigned-off-by: Felipe Contreras \n---\n git-pull.sh | 15 ++++++++++++---\n 1 file changed, 12 insertions(+), 3 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 580d633..1f777de 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -62,7 +62,7 @@ then\n \t\techo \"Please use pull.mode and branch..pullmode instead.\"\n \tfi\n fi\n-test -z \"$mode\" && mode=merge\n+test -z \"$mode\" && mode=default\n dry_run=\n while :\n do\n@@ -286,12 +286,21 @@ case \"$merge_head\" in\n *)\n \t# check if a non-fast-foward merge would be needed\n \tmerge_head=${merge_head% }\n-\tif test \"$mode\" = merge-ff-only -a -z \"$no_ff$ff_only${squash#--no-squash}\" &&\n+\tif test -z \"$no_ff$ff_only${squash#--no-squash}\" &&\n \t\ttest -n \"$orig_head\" &&\n \t\t! git merge-base --is-ancestor \"$orig_head\" \"$merge_head\" &&\n \t\t! git merge-base --is-ancestor \"$merge_head\" \"$orig_head\"\n \tthen\n-\t\tdie \"The pull was not fast-forward, please either merge or rebase.\"\n+\t\tcase \"$mode\" in\n+\t\tmerge-ff-only)\n+\t\t\tdie \"The pull was not fast-forward, please either merge or rebase.\"\n+\t\t\t;;\n+\t\tdefault)\n+\t\t\tsay \"The pull was not fast-forward, in the future you would have to choose\n+a merge or a rebase, falling back to old style for now (git pull --merge).\n+Read 'git pull --help' for more information.\"\n+\t\t\t;;\n+\t\tesac\n \tfi\n \t;;\n esac\n-- \n1.8.4-338-gefd7fa6\n"},{"id":"227188","messageId":"CAMP44s0z2=-SEJD8=K31MBcuPx=Xx__6BKaqd-MmXjAVTOr7mQ@mail.gmail.com","threadId":"34884","inReplyTo":"1378689796-19305-6-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH v3 5/5] pull: add warning on non-ff merges","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T01:49:23Z","receivedAt":"2013-09-09T01:49:23Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sun, Sep 8, 2013 at 8:23 PM, Felipe Contreras\n wrote:\n> To prepare our uses for the upcoming changes we should warn them and let\n> them know that they will need to specify a merge or a rebase in the\n> future (when a non-fast-forward situation arises). Also, let them know\n> we fallback to 'git pull --merge', so when the obsoletion of this mode\n> comes, they know what to type without interrupting or changing their\n> workflow.\n>\n> Signed-off-by: Felipe Contreras \n\nOn top of this, we probably would want to update the documentation, so\nthe user can already read about what's going on when they type 'git\npull --help' as the warning suggests.\n\ncommit 60a2f5de7da2e119b858c7ab57b5f02cce9bdb9f\nAuthor: Felipe Contreras \nDate: Sun Sep 8 20:40:21 2013 -0500\n\n pull: add documentation about non-ff merges\n\n Signed-off-by: Felipe Contreras \n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 6d55737..d503924 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -23,6 +23,7 @@ More precisely, 'git pull' runs 'git fetch' with the given\n parameters and calls 'git merge' to merge the retrieved branch\n heads into the current branch.\n With `--rebase`, it runs 'git rebase' instead of 'git merge'.\n+With `--merge`, it forces the merge, even if it's non-fast forward.\n\n should be the name of a remote repository as\n passed to linkgit:git-fetch[1]. can name an\n@@ -41,9 +42,26 @@ Assume the following history exists and the current branch is\n ------------\n A---B---C origin/master\n /\n+ D---E master\n+------------\n+\n+Then `git pull` will merge in a fast-foward way up to the new master.\n+\n+------------\n+ D---E---A---B---C master, origin/master\n+------------\n+\n+However, a non-fast-foward case looks very different.\n+\n+------------\n+ A---B---C origin/master\n+ /\n D---E---F---G master\n ------------\n\n+In the future, `git pull` will fail on these situations, however, most likely\n+you would want to force a merge, which you can do with `git pull --merge`.\n+\n Then \"`git pull`\" will fetch and replay the changes from the remote\n `master` branch since it diverged from the local `master` (i.e., `E`)\n until its current commit (`C`) on top of `master` and record the\n\n-- \nFelipe Contreras\n"},{"id":"227265","messageId":"522E3C6A.3070409@bbn.com","threadId":"34884","inReplyTo":"1378689796-19305-2-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2013-09-09T21:23:54Z","receivedAt":"2013-09-09T21:23:54Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"On 2013-09-08 21:23, Felipe Contreras wrote:\n> The old configurations still work, but get deprecated.\n\nShould some tests for the deprecated configs be added? We wouldn't want\nto accidentally break those.\n\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index ec57a15..9489a59 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -760,11 +760,11 @@ branch..mergeoptions::\n> \toption values containing whitespace characters are currently not\n> \tsupported.\n> \n> -branch..rebase::\n> -\tWhen true, rebase the branch on top of the fetched branch,\n> -\tinstead of merging the default branch from the default remote when\n> -\t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n> -\tbranch-specific manner.\n> +branch..pullmode::\n> +\tWhen \"git pull\" is run, this determines if it would either merge or\n> +\trebase the fetched branch. The possible values are 'merge' and\n> +\t'rebase'. See \"pull.mode\" for doing this in a non branch-specific\n> +\tmanner.\n> +\n> *NOTE*: this is a possibly dangerous operation; do *not* use\n> it unless you understand the implications (see linkgit:git-rebase[1]\n> @@ -1820,11 +1820,11 @@ pretty.::\n> \tNote that an alias with the same name as a built-in format\n> \twill be silently ignored.\n> \n> -pull.rebase::\n> -\tWhen true, rebase branches on top of the fetched branch, instead\n> -\tof merging the default branch from the default remote when \"git\n> -\tpull\" is run. See \"branch..rebase\" for setting this on a\n> -\tper-branch basis.\n> +pull.mode::\n> +\tWhen \"git pull\" is run, this determines if it would either merge or\n> +\trebase the fetched branch. The possible values are 'merge' and\n> +\t'rebase'. See \"branch..pullmode\" for doing this in a non\n> +\tbranch-specific manner.\n> +\n> *NOTE*: this is a possibly dangerous operation; do *not* use\n> it unless you understand the implications (see linkgit:git-rebase[1]\n\nSomewhere something should mention what the default values are\n(branch..pullmode defaults to pull.mode and pull.mode defaults to\nmerge).\n\n> diff --git a/git-pull.sh b/git-pull.sh\n> index f0df41c..de57c1d 100755\n> --- a/git-pull.sh\n> +++ b/git-pull.sh\n> @@ -43,10 +43,24 @@ log_arg= verbosity= progress= recurse_submodules= verify_signatures=\n> merge_args= edit=\n> curr_branch=$(git symbolic-ref -q HEAD)\n> curr_branch_short=\"${curr_branch#refs/heads/}\"\n> -rebase=$(git config --bool branch.$curr_branch_short.rebase)\n> +mode=$(git config branch.${curr_branch_short}.pullmode)\n> +if test -z \"$mode\"\n> +then\n> +\tmode=$(git config pull.mode)\n> +fi\n> +test \"$mode\" == 'rebase' && rebase=\"true\"\n> if test -z \"$rebase\"\n> then\n> -\trebase=$(git config --bool pull.rebase)\n> +\trebase=$(git config --bool branch.$curr_branch_short.rebase)\n> +\tif test -z \"$rebase\"\n> +\tthen\n> +\t\trebase=$(git config --bool pull.rebase)\n> +\tfi\n> +\tif test \"$rebase\" = 'true'\n> +\tthen\n> +\t\techo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n> +\t\techo \"Please use pull.mode and branch..pullmode instead.\"\n> +\tfi\n> fi\n> dry_run=\n> while :\n\nThese deprecation warning messages should be written to stderr, and\nshould probably be prefixed with \"WARNING: \".\n\n-Richard\n"},{"id":"227273","messageId":"CAMP44s1OyST3S1HEdS38WPsjq6w9SekuwT4DRUgVvduATox9tw@mail.gmail.com","threadId":"34884","inReplyTo":"522E3C6A.3070409@bbn.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-09T22:49:36Z","receivedAt":"2013-09-09T22:49:36Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote:\n> On 2013-09-08 21:23, Felipe Contreras wrote:\n>> The old configurations still work, but get deprecated.\n>\n> Should some tests for the deprecated configs be added? We wouldn't want\n> to accidentally break those.\n\nProbably, but Junio is not picking this patch anyway.\n\n>> diff --git a/Documentation/config.txt b/Documentation/config.txt\n>> index ec57a15..9489a59 100644\n>> --- a/Documentation/config.txt\n>> +++ b/Documentation/config.txt\n>> @@ -760,11 +760,11 @@ branch..mergeoptions::\n>> option values containing whitespace characters are currently not\n>> supported.\n>>\n>> -branch..rebase::\n>> - When true, rebase the branch on top of the fetched branch,\n>> - instead of merging the default branch from the default remote when\n>> - \"git pull\" is run. See \"pull.rebase\" for doing this in a non\n>> - branch-specific manner.\n>> +branch..pullmode::\n>> + When \"git pull\" is run, this determines if it would either merge or\n>> + rebase the fetched branch. The possible values are 'merge' and\n>> + 'rebase'. See \"pull.mode\" for doing this in a non branch-specific\n>> + manner.\n>> +\n>> *NOTE*: this is a possibly dangerous operation; do *not* use\n>> it unless you understand the implications (see linkgit:git-rebase[1]\n>> @@ -1820,11 +1820,11 @@ pretty.::\n>> Note that an alias with the same name as a built-in format\n>> will be silently ignored.\n>>\n>> -pull.rebase::\n>> - When true, rebase branches on top of the fetched branch, instead\n>> - of merging the default branch from the default remote when \"git\n>> - pull\" is run. See \"branch..rebase\" for setting this on a\n>> - per-branch basis.\n>> +pull.mode::\n>> + When \"git pull\" is run, this determines if it would either merge or\n>> + rebase the fetched branch. The possible values are 'merge' and\n>> + 'rebase'. See \"branch..pullmode\" for doing this in a non\n>> + branch-specific manner.\n>> +\n>> *NOTE*: this is a possibly dangerous operation; do *not* use\n>> it unless you understand the implications (see linkgit:git-rebase[1]\n>\n> Somewhere something should mention what the default values are\n> (branch..pullmode defaults to pull.mode and pull.mode defaults to\n> merge).\n>\n>> diff --git a/git-pull.sh b/git-pull.sh\n>> index f0df41c..de57c1d 100755\n>> --- a/git-pull.sh\n>> +++ b/git-pull.sh\n>> @@ -43,10 +43,24 @@ log_arg= verbosity= progress= recurse_submodules= verify_signatures=\n>> merge_args= edit=\n>> curr_branch=$(git symbolic-ref -q HEAD)\n>> curr_branch_short=\"${curr_branch#refs/heads/}\"\n>> -rebase=$(git config --bool branch.$curr_branch_short.rebase)\n>> +mode=$(git config branch.${curr_branch_short}.pullmode)\n>> +if test -z \"$mode\"\n>> +then\n>> + mode=$(git config pull.mode)\n>> +fi\n>> +test \"$mode\" == 'rebase' && rebase=\"true\"\n>> if test -z \"$rebase\"\n>> then\n>> - rebase=$(git config --bool pull.rebase)\n>> + rebase=$(git config --bool branch.$curr_branch_short.rebase)\n>> + if test -z \"$rebase\"\n>> + then\n>> + rebase=$(git config --bool pull.rebase)\n>> + fi\n>> + if test \"$rebase\" = 'true'\n>> + then\n>> + echo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n>> + echo \"Please use pull.mode and branch..pullmode instead.\"\n>> + fi\n>> fi\n>> dry_run=\n>> while :\n>\n> These deprecation warning messages should be written to stderr, and\n> should probably be prefixed with \"WARNING: \".\n\nIs there any deprecation warning that works this way?\n\n-- \nFelipe Contreras\n"},{"id":"227301","messageId":"20130910022152.GA17154@sigill.intra.peff.net","threadId":"34884","inReplyTo":"CAMP44s1OyST3S1HEdS38WPsjq6w9SekuwT4DRUgVvduATox9tw@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-09-10T02:21:52Z","receivedAt":"2013-09-10T02:21:52Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n\n> > These deprecation warning messages should be written to stderr, and\n> > should probably be prefixed with \"WARNING: \".\n> \n> Is there any deprecation warning that works this way?\n\nThe ones in C code typically use warning(), which will prefix with\n\"warning:\" and write to stderr. They do not use all-caps, though.\n\nTry \"git log --grep=deprecate -Swarning\" for some examples.\n\n-Peff\n"},{"id":"227304","messageId":"CAMP44s1FfQ-1pAK8T1cmiZk4i17HnpvzPwuZrzHiiXSmGzbrRw@mail.gmail.com","threadId":"34884","inReplyTo":"20130910022152.GA17154@sigill.intra.peff.net","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-10T06:46:27Z","receivedAt":"2013-09-10T06:46:27Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote:\n> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n>\n>> > These deprecation warning messages should be written to stderr, and\n>> > should probably be prefixed with \"WARNING: \".\n>>\n>> Is there any deprecation warning that works this way?\n>\n> The ones in C code typically use warning(), which will prefix with\n> \"warning:\" and write to stderr. They do not use all-caps, though.\n>\n> Try \"git log --grep=deprecate -Swarning\" for some examples.\n\nI'm asking about the ones in shell, because this is a shell script.\n\n-- \nFelipe Contreras\n"},{"id":"227305","messageId":"20130910065227.GA25084@sigill.intra.peff.net","threadId":"34884","inReplyTo":"CAMP44s1FfQ-1pAK8T1cmiZk4i17HnpvzPwuZrzHiiXSmGzbrRw@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-09-10T06:52:27Z","receivedAt":"2013-09-10T06:52:27Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Sep 10, 2013 at 01:46:27AM -0500, Felipe Contreras wrote:\n\n> On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote:\n> > On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n> >\n> >> > These deprecation warning messages should be written to stderr, and\n> >> > should probably be prefixed with \"WARNING: \".\n> >>\n> >> Is there any deprecation warning that works this way?\n> >\n> > The ones in C code typically use warning(), which will prefix with\n> > \"warning:\" and write to stderr. They do not use all-caps, though.\n> >\n> > Try \"git log --grep=deprecate -Swarning\" for some examples.\n> \n> I'm asking about the ones in shell, because this is a shell script.\n\nWhy would we want a deprecation warning to behave any differently if it\nis written in shell versus in C? It cannot use the warning() function,\nbut you can easily emulate it with \"echo\".\n\nDo you have some reason for not wanting the warning to go to stderr?\n\n-Peff\n"},{"id":"227309","messageId":"vpqmwnljdmn.fsf@anie.imag.fr","threadId":"34884","inReplyTo":"CAMP44s1FfQ-1pAK8T1cmiZk4i17HnpvzPwuZrzHiiXSmGzbrRw@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-09-10T08:16:00Z","receivedAt":"2013-09-10T08:16:00Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Felipe Contreras writes:\n\n> On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote:\n>> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n>>\n>>> > These deprecation warning messages should be written to stderr, and\n>>> > should probably be prefixed with \"WARNING: \".\n>>>\n>>> Is there any deprecation warning that works this way?\n>>\n>> The ones in C code typically use warning(), which will prefix with\n>> \"warning:\" and write to stderr. They do not use all-caps, though.\n>>\n>> Try \"git log --grep=deprecate -Swarning\" for some examples.\n>\n> I'm asking about the ones in shell, because this is a shell script.\n\nNo user cares whether \"git pull\" is written in shell. shell Vs C is an\nimplementation detail, stdout Vs stderr is user-visible.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"227371","messageId":"xmqqppsgwecf.fsf@gitster.dls.corp.google.com","threadId":"34884","inReplyTo":"1378689796-19305-2-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-09-10T21:34:24Z","receivedAt":"2013-09-10T21:34:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> Also 'branch..rebase' to 'branch..pullmode'.\n>\n> This way 'pull.mode' can be set to 'merge', and the default can be\n> something else.\n>\n> The old configurations still work, but get deprecated.\n\nSounds good, but we should still mention these old names in the\ndocumentation (and mark them as deprecated).\n\n> +test \"$mode\" == 'rebase' && rebase=\"true\"\n\nPOSIX test does not take \"==\" as string equality; it is a bash-ism.\n\n\ttest \"$mode\" = rebase\n"},{"id":"227895","messageId":"523B51A1.7030409@bbn.com","threadId":"34884","inReplyTo":"CAMP44s1OyST3S1HEdS38WPsjq6w9SekuwT4DRUgVvduATox9tw@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2013-09-19T19:33:53Z","receivedAt":"2013-09-19T19:33:53Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"On 2013-09-09 18:49, Felipe Contreras wrote:\n> On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote:\n>> On 2013-09-08 21:23, Felipe Contreras wrote:\n>>> The old configurations still work, but get deprecated.\n>>\n>> Should some tests for the deprecated configs be added? We wouldn't want\n>> to accidentally break those.\n> \n> Probably, but Junio is not picking this patch anyway.\n\nIt sounds to me like he would with some mods:\nhttp://thread.gmane.org/gmane.comp.version-control.git/233554/focus=234488\n\n-Richard\n"},{"id":"228758","messageId":"52588fa5c7d1c_5dc4c2be74274fa@nysa.mail","threadId":"34884","inReplyTo":"523B51A1.7030409@bbn.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-10-11T23:54:13Z","receivedAt":"2013-10-11T23:54:13Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Richard Hansen wrote:\n> On 2013-09-09 18:49, Felipe Contreras wrote:\n> > On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote:\n> >> On 2013-09-08 21:23, Felipe Contreras wrote:\n> >>> The old configurations still work, but get deprecated.\n> >>\n> >> Should some tests for the deprecated configs be added? We wouldn't want\n> >> to accidentally break those.\n> > \n> > Probably, but Junio is not picking this patch anyway.\n> \n> It sounds to me like he would with some mods:\n> http://thread.gmane.org/gmane.comp.version-control.git/233554/focus=234488\n\nThe modifications are already in this series.\n\n-- \nFelipe Contreras\n"},{"id":"228759","messageId":"52589027a4851_5dc4c2be742754f@nysa.mail","threadId":"34884","inReplyTo":"vpqmwnljdmn.fsf@anie.imag.fr","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-10-11T23:56:23Z","receivedAt":"2013-10-11T23:56:23Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Matthieu Moy wrote:\n> Felipe Contreras writes:\n> \n> > On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote:\n> >> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n> >>\n> >>> > These deprecation warning messages should be written to stderr, and\n> >>> > should probably be prefixed with \"WARNING: \".\n> >>>\n> >>> Is there any deprecation warning that works this way?\n> >>\n> >> The ones in C code typically use warning(), which will prefix with\n> >> \"warning:\" and write to stderr. They do not use all-caps, though.\n> >>\n> >> Try \"git log --grep=deprecate -Swarning\" for some examples.\n> >\n> > I'm asking about the ones in shell, because this is a shell script.\n> \n> No user cares whether \"git pull\" is written in shell. shell Vs C is an\n> implementation detail, stdout Vs stderr is user-visible.\n\nYou are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\nmeantime no shell script does that, and that's no reason to reject this patch\nseries.\n\n-- \nFelipe Contreras\n"},{"id":"228762","messageId":"525898B9.5020904@bbn.com","threadId":"34884","inReplyTo":"52589027a4851_5dc4c2be742754f@nysa.mail","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2013-10-12T00:32:57Z","receivedAt":"2013-10-12T00:32:57Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"On 2013-10-11 19:56, Felipe Contreras wrote:\n> Matthieu Moy wrote:\n>> Felipe Contreras writes:\n>>\n>>> On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote:\n>>>> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote:\n>>>>\n>>>>>> These deprecation warning messages should be written to stderr, and\n>>>>>> should probably be prefixed with \"WARNING: \".\n>>>>>\n>>>>> Is there any deprecation warning that works this way?\n>>>>\n>>>> The ones in C code typically use warning(), which will prefix with\n>>>> \"warning:\" and write to stderr. They do not use all-caps, though.\n>>>>\n>>>> Try \"git log --grep=deprecate -Swarning\" for some examples.\n>>>\n>>> I'm asking about the ones in shell, because this is a shell script.\n>>\n>> No user cares whether \"git pull\" is written in shell. shell Vs C is an\n>> implementation detail, stdout Vs stderr is user-visible.\n> \n> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\n> meantime no shell script does that, and that's no reason to reject this patch\n> series.\n\nSure, but is is a reason to reroll the patch series. Maybe it's not a\nstrong enough reason on its own to reroll, but if you're going to reroll\nanyway, this should be fixed.\n\n-Richard\n"},{"id":"228764","messageId":"20131012005035.GA27939@sigill.intra.peff.net","threadId":"34884","inReplyTo":"52589027a4851_5dc4c2be742754f@nysa.mail","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-10-12T00:50:35Z","receivedAt":"2013-10-12T00:50:35Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Oct 11, 2013 at 06:56:23PM -0500, Felipe Contreras wrote:\n\n> > >>> > These deprecation warning messages should be written to stderr, and\n> > >>> > should probably be prefixed with \"WARNING: \".\n> > >>>\n> > >>> Is there any deprecation warning that works this way?\n> > >>\n> > >> The ones in C code typically use warning(), which will prefix with\n> > >> \"warning:\" and write to stderr. They do not use all-caps, though.\n> > >>\n> > >> Try \"git log --grep=deprecate -Swarning\" for some examples.\n> > >\n> > > I'm asking about the ones in shell, because this is a shell script.\n> > \n> > No user cares whether \"git pull\" is written in shell. shell Vs C is an\n> > implementation detail, stdout Vs stderr is user-visible.\n> \n> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\n> meantime no shell script does that, and that's no reason to reject this patch\n> series.\n\nYou are completely missing Matthieu's point that we attempt to be\nconsistent in the format of messages, as well as where they are output,\nand from a user's perspective it does not matter what language the tool\nis implemented in.\n\nAlso, you are wrong that there are no other shell scripts that behave as\nRichard said:\n\n $ git grep '>&2' | grep -i deprecate\n contrib/completion/git-completion.bash: echo \"WARNING: this script is deprecated, please see git-completion.zsh\" 1>&2\n contrib/examples/git-resolve.sh:echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2\n git-lost-found.sh:echo \"WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'\" >&2\n\nPlease, can we just squash in the patch below and stop talking about\nthis?\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex a9cf7ac..9c4091c 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -58,8 +58,8 @@ then\n \tif test \"$rebase\" = 'true'\n \tthen\n \t\tmode=\"rebase\"\n-\t\techo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n-\t\techo \"Please use pull.mode and branch..pullmode instead.\"\n+\t\techo >&2 \"warning: The configurations pull.rebase and branch..rebase are deprecated.\"\n+\t\techo >&2 \"Please use pull.mode and branch..pullmode instead.\"\n \tfi\n fi\n test -z \"$mode\" && mode=merge\n"},{"id":"228765","messageId":"CAMP44s2y0UZ9uS8xtG2WDD=k5pHSG+K+_WM2dj-DVaUDy4djdA@mail.gmail.com","threadId":"34884","inReplyTo":"20131012005035.GA27939@sigill.intra.peff.net","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-10-12T01:15:46Z","receivedAt":"2013-10-12T01:15:46Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Oct 11, 2013 at 7:50 PM, Jeff King wrote:\n> On Fri, Oct 11, 2013 at 06:56:23PM -0500, Felipe Contreras wrote:\n>\n>> > >>> > These deprecation warning messages should be written to stderr, and\n>> > >>> > should probably be prefixed with \"WARNING: \".\n>> > >>>\n>> > >>> Is there any deprecation warning that works this way?\n>> > >>\n>> > >> The ones in C code typically use warning(), which will prefix with\n>> > >> \"warning:\" and write to stderr. They do not use all-caps, though.\n>> > >>\n>> > >> Try \"git log --grep=deprecate -Swarning\" for some examples.\n>> > >\n>> > > I'm asking about the ones in shell, because this is a shell script.\n>> >\n>> > No user cares whether \"git pull\" is written in shell. shell Vs C is an\n>> > implementation detail, stdout Vs stderr is user-visible.\n>>\n>> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\n>> meantime no shell script does that, and that's no reason to reject this patch\n>> series.\n>\n> You are completely missing Matthieu's point that we attempt to be\n> consistent in the format of messages, as well as where they are output,\n> and from a user's perspective it does not matter what language the tool\n> is implemented in.\n\nIf we truly did that, there should be a warning () function, like in C.\n\n> Also, you are wrong that there are no other shell scripts that behave as\n> Richard said:\n>\n> $ git grep '>&2' | grep -i deprecate\n> contrib/completion/git-completion.bash: echo \"WARNING: this script is deprecated, please see git-completion.zsh\" 1>&2\n> contrib/examples/git-resolve.sh:echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2\n> git-lost-found.sh:echo \"WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'\" >&2\n>\n> Please, can we just squash in the patch below and stop talking about\n> this?\n>\n> diff --git a/git-pull.sh b/git-pull.sh\n> index a9cf7ac..9c4091c 100755\n> --- a/git-pull.sh\n> +++ b/git-pull.sh\n> @@ -58,8 +58,8 @@ then\n> if test \"$rebase\" = 'true'\n> then\n> mode=\"rebase\"\n> - echo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n> - echo \"Please use pull.mode and branch..pullmode instead.\"\n> + echo >&2 \"warning: The configurations pull.rebase and branch..rebase are deprecated.\"\n> + echo >&2 \"Please use pull.mode and branch..pullmode instead.\"\n> fi\n> fi\n> test -z \"$mode\" && mode=merge\n\nAre you sure you want me to squash that in? Because the warnings\nwouldn't be consistent. Some would be \"WARNING: \" and others would be\n\"warning: \". Personally I don't care, but if your argument is\nconsistency, you should. If we had a warning () function, we could\ntruly be consistent.\n\n-- \nFelipe Contreras\n"},{"id":"228766","messageId":"20131012012515.GA1778@sigill.intra.peff.net","threadId":"34884","inReplyTo":"CAMP44s2y0UZ9uS8xtG2WDD=k5pHSG+K+_WM2dj-DVaUDy4djdA@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-10-12T01:25:15Z","receivedAt":"2013-10-12T01:25:15Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Oct 11, 2013 at 08:15:46PM -0500, Felipe Contreras wrote:\n\n> >> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\n> >> meantime no shell script does that, and that's no reason to reject this patch\n> >> series.\n> >\n> > You are completely missing Matthieu's point that we attempt to be\n> > consistent in the format of messages, as well as where they are output,\n> > and from a user's perspective it does not matter what language the tool\n> > is implemented in.\n> \n> If we truly did that, there should be a warning () function, like in C.\n\nOr people could hand-code them to look similar, which is exactly what\nhas happened.\n\nIf you want to factor out a warning function to clean up the code, be my\nguest. But the lack of one does not provide an argument that you should\nbreak consistency.\n\n> > - echo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n> > - echo \"Please use pull.mode and branch..pullmode instead.\"\n> > + echo >&2 \"warning: The configurations pull.rebase and branch..rebase are deprecated.\"\n> > + echo >&2 \"Please use pull.mode and branch..pullmode instead.\"\n> [...]\n> \n> Are you sure you want me to squash that in? Because the warnings\n> wouldn't be consistent. Some would be \"WARNING: \" and others would be\n> \"warning: \". Personally I don't care, but if your argument is\n> consistency, you should. If we had a warning () function, we could\n> truly be consistent.\n\nIt is significant in the most important ways, which are labeling it at\nall, and sending it to stderr. Capitalization is less important, in my\nopinion.\n\nUsing a lowercase version is much more consistent with the warnings\nproduced by C code, which is why I chose it over the capitalized\nversion. Again, if you want to change the existing WARNING cases in the\nshell scripts to be consistent with C output, be my guest.\n\nDo you actually have some reason for wanting to output to go to stdout?\n\n-Peff\n"},{"id":"228768","messageId":"CAMP44s3669E7JyEjP_ErYt7JN2eHv0mX4+p_=ZP4_LDatnw2vg@mail.gmail.com","threadId":"34884","inReplyTo":"20131012012515.GA1778@sigill.intra.peff.net","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-10-12T02:08:00Z","receivedAt":"2013-10-12T02:08:00Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Oct 11, 2013 at 8:25 PM, Jeff King wrote:\n> On Fri, Oct 11, 2013 at 08:15:46PM -0500, Felipe Contreras wrote:\n>\n>> >> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in the\n>> >> meantime no shell script does that, and that's no reason to reject this patch\n>> >> series.\n>> >\n>> > You are completely missing Matthieu's point that we attempt to be\n>> > consistent in the format of messages, as well as where they are output,\n>> > and from a user's perspective it does not matter what language the tool\n>> > is implemented in.\n>>\n>> If we truly did that, there should be a warning () function, like in C.\n>\n> Or people could hand-code them to look similar, which is exactly what\n> has happened.\n\nAnd by doing that be prone to make mistakes, like using 'WARNING',\ninstead of 'warning'. But I guess you don't care about consistency\n_that much_.\n\n> If you want to factor out a warning function to clean up the code, be my\n> guest. But the lack of one does not provide an argument that you should\n> break consistency.\n\nConsistency is already broken.\n\n>> > - echo \"The configurations pull.rebase and branch..rebase are deprecated.\"\n>> > - echo \"Please use pull.mode and branch..pullmode instead.\"\n>> > + echo >&2 \"warning: The configurations pull.rebase and branch..rebase are deprecated.\"\n>> > + echo >&2 \"Please use pull.mode and branch..pullmode instead.\"\n>> [...]\n>>\n>> Are you sure you want me to squash that in? Because the warnings\n>> wouldn't be consistent. Some would be \"WARNING: \" and others would be\n>> \"warning: \". Personally I don't care, but if your argument is\n>> consistency, you should. If we had a warning () function, we could\n>> truly be consistent.\n>\n> It is significant in the most important ways, which are labeling it at\n> all, and sending it to stderr. Capitalization is less important, in my\n> opinion.\n\nIt's still inconsistent.\n\n> Using a lowercase version is much more consistent with the warnings\n> produced by C code, which is why I chose it over the capitalized\n> version. Again, if you want to change the existing WARNING cases in the\n> shell scripts to be consistent with C output, be my guest.\n\nIt seems you are not that interested in consistency after all.\n\n> Do you actually have some reason for wanting to output to go to stdout?\n\nI'm fine with 'echo \"warning: foo\" >&2', but still, if you really\ncared about consistency, there would be a warn() function, precisely\nto avoid the mistakes of WARNING vs. warning which are already there,\nplus future ones.\n\n-- \nFelipe Contreras\n"},{"id":"228771","messageId":"5258D2D3.9030704@bbn.com","threadId":"34884","inReplyTo":"CAMP44s3669E7JyEjP_ErYt7JN2eHv0mX4+p_=ZP4_LDatnw2vg@mail.gmail.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2013-10-12T04:40:51Z","receivedAt":"2013-10-12T04:40:51Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"On 2013-10-11 22:08, Felipe Contreras wrote:\n> I'm fine with 'echo \"warning: foo\" >&2', but still, if you really\n> cared about consistency, there would be a warn() function\n\nSo add one! It's only one simple line:\n\n warning() { printf %s\\\\n \"warning: $*\" >&2; }\n\nSo much discussion for something so trivial...\n\n-Richard\n"},{"id":"228774","messageId":"CAMP44s1i3bxGtvMS38j3Tk5gKAZEHSKf5MBF2qJ_ReBApA1u7Q@mail.gmail.com","threadId":"34884","inReplyTo":"5258D2D3.9030704@bbn.com","subject":"Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-10-12T06:21:28Z","receivedAt":"2013-10-12T06:21:28Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Oct 11, 2013 at 11:40 PM, Richard Hansen wrote:\n> On 2013-10-11 22:08, Felipe Contreras wrote:\n>> I'm fine with 'echo \"warning: foo\" >&2', but still, if you really\n>> cared about consistency, there would be a warn() function\n>\n> So add one! It's only one simple line:\n>\n> warning() { printf %s\\\\n \"warning: $*\" >&2; }\n\nIt probably should be\n\nwarning () {\n printf 'warning: %s\\n' \"$*\" >&2\n}\n\nBut why don't _you_ do it? I have enough patches being ignored to add\nmore to the list, specially for something I care nothing about.\n\n> So much discussion for something so trivial...\n\nTrivial things are what cause more discussion.\n\n-- \nFelipe Contreras\n"}]}