diff options
author | Brian Gernhardt <benji@silverinsanity.com> | 2007-11-04 10:31:26 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 15:04:57 -0800 |
commit | 9f12bec4386fc96e5b617268822cbb75e4c76101 (patch) | |
tree | af8f00512ded476b81813cd460279ea5d5c181bb /t | |
parent | ae3e76c2991ddd5fd72cff22cd39d5d297e63504 (diff) | |
download | git-9f12bec4386fc96e5b617268822cbb75e4c76101.tar.gz git-9f12bec4386fc96e5b617268822cbb75e4c76101.tar.xz |
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>
Diffstat (limited to 't')
-rwxr-xr-x | t/t3502-cherry-pick-merge.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index 3274c6141..7c92e261f 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-merge.sh @@ -36,7 +36,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' ' git reset --hard && git checkout a^0 && ! git cherry-pick -m 1 b && - git diff --exit-code a + git diff --exit-code a -- ' @@ -45,7 +45,7 @@ test_expect_success 'cherry pick a merge without -m should fail' ' git reset --hard && git checkout a^0 && ! git cherry-pick c && - git diff --exit-code a + git diff --exit-code a -- ' @@ -98,7 +98,7 @@ test_expect_success 'revert a merge (1)' ' git reset --hard && git checkout c^0 && git revert -m 1 c && - git diff --exit-code a + git diff --exit-code a -- ' @@ -107,7 +107,7 @@ test_expect_success 'revert a merge (2)' ' git reset --hard && git checkout c^0 && git revert -m 2 c && - git diff --exit-code b + git diff --exit-code b -- ' |