Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2007-11-04 18:31:26 +0300
committerJunio C Hamano <gitster@pobox.com>2007-11-06 02:04:57 +0300
commit9f12bec4386fc96e5b617268822cbb75e4c76101 (patch)
treeaf8f00512ded476b81813cd460279ea5d5c181bb /t/t3502-cherry-pick-merge.sh
parentae3e76c2991ddd5fd72cff22cd39d5d297e63504 (diff)
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/t3502-cherry-pick-merge.sh')
-rwxr-xr-xt/t3502-cherry-pick-merge.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index 3274c6141b..7c92e261fc 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 --
'