Skip to content

Commit

Permalink
t3502: Disambiguate between file and rev by adding --
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Nov 5, 2007
1 parent ae3e76c commit 9f12bec
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t3502-cherry-pick-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 --
'

Expand All @@ -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 --
'

Expand Down Expand Up @@ -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 --
'

Expand All @@ -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 --
'

Expand Down

0 comments on commit 9f12bec

Please sign in to comment.