[PATCH] t1410: Fix for case insensitive filesystems
- From
Brian Gernhardt <brian@gernhardtsoftware.com>
- Date
- Nov 10, 2014, 01:48 UTC
- Message-ID
- <1415584086-41637-1-git-send-email-brian@gernhardtsoftware.com>
A pair of recently added tests used branches a and a/b, but earlier tests created files A and A/B. On case insensitive filesystems (such as HFS+), that causes git to complain about the name being ambiguous between branch and file. Resolve by renaming the branches to aa and aa/bb.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> --- t/t1410-reflog.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 976c1d4..ac31e19 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -254,36 +254,36 @@ test_expect_success 'checkout should not delete log for packed ref' ' ' test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' ' - test_when_finished "git branch -d a || git branch -d a/b" && + test_when_finished "git branch -d aa || git branch -d aa/bb" && - git branch a/b master && - echo "a/b@{0} branch: Created from master" >expect && - git log -g --format="%gd %gs" a/b >actual && + git branch aa/bb master && + echo "aa/bb@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" aa/bb >actual && test_cmp expect actual && - git branch -d a/b && + git branch -d aa/bb && - # now logs/refs/heads/a is a stale directory, but - # we should move it out of the way to create "a" reflog - git branch a master && - echo "a@{0} branch: Created from master" >expect && - git log -g --format="%gd %gs" a >actual && + # now logs/refs/heads/aa is a stale directory, but + # we should move it out of the way to create "aa" reflog + git branch aa master && + echo "aa@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" aa >actual && test_cmp expect actual ' test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' ' - test_when_finished "git branch -d a || git branch -d a/b" && + test_when_finished "git branch -d aa || git branch -d aa/bb" && - git branch a/b master && - echo "a/b@{0} branch: Created from master" >expect && - git log -g --format="%gd %gs" a/b >actual && + git branch aa/bb master && + echo "aa/bb@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" aa/bb >actual && test_cmp expect actual && - git branch -d a/b && + git branch -d aa/bb && - # same as before, but we only create a reflog for "a" if + # same as before, but we only create a reflog for "aa" if # it already exists, which it does not - git -c core.logallrefupdates=false branch a master && + git -c core.logallrefupdates=false branch aa master && : >expect && - git log -g --format="%gd %gs" a >actual && + git log -g --format="%gd %gs" aa >actual && test_cmp expect actual '
-- 2.2.0.rc0.209.g31b9a22