{"thread":{"id":"22373","subject":"[PATCH] pull: re-fix command line generation","startedAt":"2010-01-24T19:12:41Z","lastAt":"2010-01-24T19:12:41Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132553","messageId":"7vvder71w6.fsf@alter.siamese.dyndns.org","threadId":"22373","inReplyTo":null,"subject":"[PATCH] pull: re-fix command line generation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-24T19:12:41Z","receivedAt":"2010-01-24T19:12:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"14e5d40 (pull: Fix parsing of -X<option>, 2010-01-17) forgot that\nmerge_name needs to stay as a single non-interpolated string.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n\n * Just in case somebody is on 'master' and uses \"pull --log\"...\n\n git-pull.sh         |    2 +-\n t/t5524-pull-msg.sh |   35 +++++++++++++++++++++++++++++++++++\n 2 files changed, 36 insertions(+), 1 deletions(-)\n create mode 100755 t/t5524-pull-msg.sh\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 2de4c3a..38331a8 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -275,7 +275,7 @@ true)\n *)\n \teval=\"git-merge $diffstat $no_commit $squash $no_ff $ff_only\"\n \teval=\"$eval  $log_arg $strategy_args $merge_args\"\n-\teval=\"$eval \\\"$merge_name\\\" HEAD $merge_head $verbosity\"\n+\teval=\"$eval \\\"\\$merge_name\\\" HEAD $merge_head $verbosity\"\n \t;;\n esac\n eval \"exec $eval\"\ndiff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh\nnew file mode 100755\nindex 0000000..8cccecc\n--- /dev/null\n+++ b/t/t5524-pull-msg.sh\n@@ -0,0 +1,35 @@\n+#!/bin/sh\n+\n+test_description='git pull message generation'\n+\n+. ./test-lib.sh\n+\n+dollar='$Dollar'\n+\n+test_expect_success setup '\n+\ttest_commit initial afile original &&\n+\tgit clone . cloned &&\n+\t(\n+\t\tcd cloned &&\n+\t\techo added >bfile &&\n+\t\tgit add bfile &&\n+\t\ttest_tick &&\n+\t\tgit commit -m \"add bfile\"\n+\t) &&\n+\ttest_tick && test_tick &&\n+\techo \"original $dollar\" >afile &&\n+\tgit add afile &&\n+\tgit commit -m \"do not clobber $dollar signs\"\n+'\n+\n+test_expect_success pull '\n+(\n+\tcd cloned &&\n+\tgit pull --log &&\n+\tgit log -2 &&\n+\tgit cat-file commit HEAD >result &&\n+\tgrep Dollar result\n+)\n+'\n+\n+test_done\n-- \n1.6.6.1.557.g77031\n"}]}