t3502: Disambiguate between file and rev by adding --
On a case insensitive file system, this test fails because git-diff doesn't know if it is asking for the file "A" or the tag "a". Adding "--" at the end of the ambiguous commands allows the test to finish properly. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gernhardt committed
Nov 4, 2007 at 10:31 UTC
9f12bec4386fc96e5b617268822cbb75e4c76101
1 file changed
+4
-4
t/t3502-cherry-pick-merge.sh
+4
-4
@@ -36,7 +36,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '
36
git reset --hard &&
37
git checkout a^0 &&
38
! git cherry-pick -m 1 b &&
39
- git diff --exit-code a
39
+ git diff --exit-code a --
40
41
'
42
@@ -45,7 +45,7 @@ test_expect_success 'cherry pick a merge without -m should fail' '
45
git reset --hard &&
46
git checkout a^0 &&
47
! git cherry-pick c &&
48
- git diff --exit-code a
48
+ git diff --exit-code a --
49
50
'
51
@@ -98,7 +98,7 @@ test_expect_success 'revert a merge (1)' '
98
git reset --hard &&
99
git checkout c^0 &&
100
git revert -m 1 c &&
101
- git diff --exit-code a
101
+ git diff --exit-code a --
102
103
'
104
@@ -107,7 +107,7 @@ test_expect_success 'revert a merge (2)' '
107
git reset --hard &&
108
git checkout c^0 &&
109
git revert -m 2 c &&
110
- git diff --exit-code b
110
+ git diff --exit-code b --
111
112
'
113