tests: fix syntax error in "Use advise() for hints" test
Change the test introduced in the "Use advise() for hints" patch by Jonathan Nieder not to use '' for quotes inside '' delimited code. It ended up introducing a file called <paths> to the main git repository. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Aug 18, 2010 at 14:36 UTC
997b688769f8d3ea539990ab53d6a44a46a2b2b4
1 file changed
+5
-5
t/t3507-cherry-pick-conflict.sh
+5
-5
@@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
38
test "$head" = "$newhead"
39
'
40
41
-test_expect_success 'advice from failed cherry-pick' '
41
+test_expect_success 'advice from failed cherry-pick' "
42
git checkout -f initial^0 &&
43
git read-tree -u --reset HEAD &&
44
git clean -d -f -f -q -x &&
@@ -46,17 +46,17 @@ test_expect_success 'advice from failed cherry-pick' '
46
git update-index --refresh &&
47
git diff-index --exit-code HEAD &&
48
49
- picked=$(git rev-parse --short picked) &&
49
+ picked=\$(git rev-parse --short picked) &&
50
cat <<-EOF >expected &&
51
- error: could not apply $picked... picked
51
+ error: could not apply \$picked... picked
52
hint: after resolving the conflicts, mark the corrected paths
53
hint: with 'git add <paths>' or 'git rm <paths>'
54
- hint: and commit the result with 'git commit -c $picked'
54
+ hint: and commit the result with 'git commit -c \$picked'
55
EOF
56
test_must_fail git cherry-pick picked 2>actual &&
57
58
test_cmp expected actual
59
-'
59
+"
60
61
test_expect_success 'failed cherry-pick produces dirty index' '
62