The call to "git reset --hard B1" failed on case-insensitive file systems (such as the default settings for HFS+) because there was both a tag "B1" and a file "b1". Adding "--" to the command makes it clear that we mean commit B1. Signed-off-by: Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx> --- 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.418.gd79e6.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
