{"thread":{"id":"21912","subject":"Weird message when pulling git version 1.6.6.rc1.39.g9a42","startedAt":"2009-12-08T22:05:35Z","lastAt":"2009-12-09T06:00:00Z","messageCount":4,"participants":["Alejandro Riveira","Junio C Hamano","Nanako Shiraishi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"129580","messageId":"hfmijf$dl1$1@ger.gmane.org","threadId":"21912","inReplyTo":null,"subject":"Weird message when pulling git version 1.6.6.rc1.39.g9a42","fromName":"Alejandro Riveira","fromEmail":"ariveira@gmail.com","sentAt":"2009-12-08T22:05:35Z","receivedAt":"2009-12-08T22:05:35Z","isPatch":false,"sender":{"key":"ariveira@gmail.com","avatar":null},"body":"$ git pull\nremote: Counting objects: 9, done.\nremote: Compressing objects: 100% (5/5), done.\nremote: Total 5 (delta 4), reused 0 (delta 0)\nUnpacking objects: 100% (5/5), done.\nFrom git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n 6035ccd..a252e74 master -> origin/master\nUpdating 6035ccd..a252e74\nFast-forward (no commit created; -m option ignored) # what is this ??\n net/sctp/sysctl.c | 1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n"},{"id":"129584","messageId":"7vmy1t6nye.fsf@alter.siamese.dyndns.org","threadId":"21912","inReplyTo":"hfmijf$dl1$1@ger.gmane.org","subject":"Re: Weird message when pulling git version 1.6.6.rc1.39.g9a42","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-08T23:33:13Z","receivedAt":"2009-12-08T23:33:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alejandro Riveira writes:\n\n> $ git pull\n> remote: Counting objects: 9, done.\n> remote: Compressing objects: 100% (5/5), done.\n> remote: Total 5 (delta 4), reused 0 (delta 0)\n> Unpacking objects: 100% (5/5), done.\n> From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n> 6035ccd..a252e74 master -> origin/master\n> Updating 6035ccd..a252e74\n> Fast-forward (no commit created; -m option ignored) # what is this ??\n> net/sctp/sysctl.c | 1 -\n> 1 files changed, 0 insertions(+), 1 deletions(-)\n\nThanks for reporting.\n\nWarning about a message that the end user didn't give the command is\nclearly wrong. I guess we would want to revert c0ecb07 (git-pull.sh: Fix\ncall to git-merge for new command format, 2009-12-01), and b81e00a\n(git-merge: a deprecation notice of the ancient command line syntax,\n2009-11-30).\n\nReverting them will still keep 76bf488 (Do not misidentify \"git merge foo\nHEAD\" as an old-style invocation, 2009-12-02) that resulted in the change\nwe are reverting here, so we are still ahead ;-)\n\n http://thread.gmane.org/gmane.comp.version-control.git/134103/focus=134145\n\n-- >8 --\nSubject: [PATCH] Revert recent \"git merge HEAD ...\" deprecation\n\nThis reverts commit c0ecb07048ce2123589a2f077d296e8cf29a9570 \"git-pull.sh:\nFix call to git-merge for new command format\" and\n\ncommit b81e00a965c62ca72a4b9db425ee173de147808d \"git-merge: a deprecation\nnotice of the ancient command line syntax\".\n\nThey caused a \"git pull\" (without any arguments, and without any local\ncommits---only to update to the other side) to warn that commit log\nmessage is ignored because the merge resulted in a fast-forward.\n\nAnother possible solution is to add an extra option to \"git merge\" so that\n\"git pull\" can tell it that the message given is not coming from the end\nuser (the canned message is passed just in case the merge resulted in a\nnon-ff and caused commit), but I think it is easier _not_ to deprecate the\nold syntax.\n\nSigned-off-by: Junio C Hamano \n---\n builtin-merge.c | 6 ------\n git-pull.sh | 6 +++---\n 2 files changed, 3 insertions(+), 9 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 56a1bb6..f1c84d7 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -796,11 +796,6 @@ static int suggest_conflicts(void)\n \treturn 1;\n }\n \n-static const char deprecation_warning[] =\n-\t\"'git merge HEAD ' is deprecated. Please update\\n\"\n-\t\"your script to use 'git merge -m ' instead.\\n\"\n-\t\"In future versions of git, this syntax will be removed.\";\n-\n static struct commit *is_old_style_invocation(int argc, const char **argv)\n {\n \tstruct commit *second_token = NULL;\n@@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)\n \t\t\tdie(\"'%s' is not a commit\", argv[1]);\n \t\tif (hashcmp(second_token->object.sha1, head))\n \t\t\treturn NULL;\n-\t\twarning(deprecation_warning);\n \t}\n \treturn second_token;\n }\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 502af1a..bfeb4a0 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -216,7 +216,7 @@ fi\n \n merge_name=$(git fmt-merge-msg $log_arg <\"$GIT_DIR/FETCH_HEAD\") || exit\n test true = \"$rebase\" &&\n-\texec git rebase $diffstat $strategy_args --onto $merge_head \\\n+\texec git-rebase $diffstat $strategy_args --onto $merge_head \\\n \t${oldremoteref:-$merge_head}\n-exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \\\n-\t-m \"$merge_name\" $merge_head\n+exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \\\n+\t\"$merge_name\" HEAD $merge_head $verbosity\n-- \n1.6.6.rc1.42.gf9ad7\n"},{"id":"129596","messageId":"20091209125556.6117@nanako3.lavabit.com","threadId":"21912","inReplyTo":"7vmy1t6nye.fsf@alter.siamese.dyndns.org","subject":"Re: Weird message when pulling git version 1.6.6.rc1.39.g9a42","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-12-09T03:55:56Z","receivedAt":"2009-12-09T03:55:56Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Junio C Hamano \n\n> Alejandro Riveira writes:\n>\n>> $ git pull\n>> remote: Counting objects: 9, done.\n>> remote: Compressing objects: 100% (5/5), done.\n>> remote: Total 5 (delta 4), reused 0 (delta 0)\n>> Unpacking objects: 100% (5/5), done.\n>> From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n>> 6035ccd..a252e74 master -> origin/master\n>> Updating 6035ccd..a252e74\n>> Fast-forward (no commit created; -m option ignored) # what is this ??\n>> net/sctp/sysctl.c | 1 -\n>> 1 files changed, 0 insertions(+), 1 deletions(-)\n>\n> Thanks for reporting.\n>\n> Warning about a message that the end user didn't give the command is\n> clearly wrong. I guess we would want to revert c0ecb07 (git-pull.sh: Fix\n> call to git-merge for new command format, 2009-12-01), and b81e00a\n> (git-merge: a deprecation notice of the ancient command line syntax,\n> 2009-11-30).\n>\n> Reverting them will still keep 76bf488 (Do not misidentify \"git merge foo\n> HEAD\" as an old-style invocation, 2009-12-02) that resulted in the change\n> we are reverting here, so we are still ahead ;-)\n>\n> http://thread.gmane.org/gmane.comp.version-control.git/134103/focus=134145\n\nSorry for causing too much trouble. I feel bad.\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"129605","messageId":"7vskbkvg9r.fsf@alter.siamese.dyndns.org","threadId":"21912","inReplyTo":"20091209125556.6117@nanako3.lavabit.com","subject":"Re: Weird message when pulling git version 1.6.6.rc1.39.g9a42","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-09T06:00:00Z","receivedAt":"2009-12-09T06:00:00Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Quoting Junio C Hamano \n>\n>> Reverting them will still keep 76bf488 (Do not misidentify \"git merge foo\n>> HEAD\" as an old-style invocation, 2009-12-02) that resulted in the change\n>> we are reverting here, so we are still ahead ;-)\n>>\n>> http://thread.gmane.org/gmane.comp.version-control.git/134103/focus=134145\n>\n> Sorry for causing too much trouble. I feel bad.\n\nOh, please don't be. You reported a real problem, and we do not shoot the\nmessengers.\n"}]}