[PATCH] t3502: Disambiguate between file and rev by adding --

[PATCH] t3502: Disambiguate between file and rev by adding --

[Brian Gernhardt]

This test failed because git-diff didn't know if it was asking for the
file "a" or the branch "a".  Adding "--" at the end of the ambiguous
commands allows the test to finish properly.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
 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 3274c61..7c92e26 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 --
 
 '
 
-- 
1.5.3.5.530.gcd7a

Re: [PATCH] t3502: Disambiguate between file and rev by adding --

[Alex Riesen]

Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:
> This test failed because git-diff didn't know if it was asking for the
> file "a" or the branch "a".  Adding "--" at the end of the ambiguous
> commands allows the test to finish properly.

To be precise: this is ambiguous only on case-challenged filesystems

Re: [PATCH] t3502: Disambiguate between file and rev by adding --

[Brian Gernhardt]

On Nov 5, 2007, at 5:25 PM, Alex Riesen wrote:

> Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:
>> This test failed because git-diff didn't know if it was asking for  
>> the
>> file "a" or the branch "a".  Adding "--" at the end of the ambiguous
>> commands allows the test to finish properly.
>
> To be precise: this is ambiguous only on case-challenged filesystems

Oh.  I just saw the ambiguous error.  Should I re-post with a more  
correct commit message?

~~B

Re: [PATCH] t3502: Disambiguate between file and rev by adding --

[Junio C Hamano]

Brian Gernhardt <benji@silverinsanity.com> writes:

> On Nov 5, 2007, at 5:25 PM, Alex Riesen wrote:
>
>> Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:
>>> This test failed because git-diff didn't know if it was asking for
>>> the
>>> file "a" or the branch "a".  Adding "--" at the end of the ambiguous
>>> commands allows the test to finish properly.
>>
>> To be precise: this is ambiguous only on case-challenged filesystems
>
> Oh.  I just saw the ambiguous error.  Should I re-post with a more
> correct commit message?

This is what I wrote but haven't pushed out (I will have to tend
other topics first):

commit 9f12bec4386fc96e5b617268822cbb75e4c76101
Author: Brian Gernhardt <benji@silverinsanity.com>
Date:   Sun Nov 4 10:31:26 2007 -0500

    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>