diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-12 22:59:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-12 22:59:58 +0300 |
commit | bbebdc1dcaf4a004391c7148ac1ce32b2d4633ee (patch) | |
tree | 2b7cd8b24c654a211ee5e929df1b761213716dd3 /t/t1410-reflog.sh | |
parent | f6f61cbbad0611e03b712cc354f1665b5d7b087e (diff) | |
parent | aae828b911e7c0285f10476d42758101825b9add (diff) |
Merge branch 'jk/fetch-reflog-df-conflict'
Fix-up a test for portability.
* jk/fetch-reflog-df-conflict:
t1410: fix breakage on case-insensitive filesystems
Diffstat (limited to 't/t1410-reflog.sh')
-rwxr-xr-x | t/t1410-reflog.sh | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 976c1d4277..8cf446165e 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 one || git branch -d one/two" && - 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 one/two master && + echo "one/two@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" one/two >actual && test_cmp expect actual && - git branch -d a/b && + git branch -d one/two && - # 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/one is a stale directory, but + # we should move it out of the way to create "one" reflog + git branch one master && + echo "one@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" one >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 one || git branch -d one/two" && - 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 one/two master && + echo "one/two@{0} branch: Created from master" >expect && + git log -g --format="%gd %gs" one/two >actual && test_cmp expect actual && - git branch -d a/b && + git branch -d one/two && - # same as before, but we only create a reflog for "a" if + # same as before, but we only create a reflog for "one" if # it already exists, which it does not - git -c core.logallrefupdates=false branch a master && + git -c core.logallrefupdates=false branch one master && : >expect && - git log -g --format="%gd %gs" a >actual && + git log -g --format="%gd %gs" one >actual && test_cmp expect actual ' |