From: Arjen Laarhoven Date: Wed, 04 Feb 2009 19:42:36 GMT Subject: [PATCH] t3411: Fix ambiguous filename/tagname in setup Message-ID: <1233776556-9047-1-git-send-email-arjen@yaph.org> After commit 37e5c8f (Simplify t3411) the test setup fails on case-insensitive filesystems because 'git reset' can't disambiguate the filenames and tagnames. An explicit '--' to 'git reset' fixes this. Signed-off-by: Arjen Laarhoven --- t/t3411-rebase-preserve-around-merges.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index 6533505..e544451 100755 --- a/t/t3411-rebase-preserve-around-merges.sh +++ b/t/t3411-rebase-preserve-around-merges.sh @@ -24,7 +24,7 @@ test_expect_success 'setup' ' test_commit A1 && test_commit B1 && test_commit C1 && - git reset --hard B1 && + git reset --hard B1 -- && test_commit D1 && test_merge E1 C1 && test_commit F1 -- 1.6.1.2.467.g081e7