From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Nov 2014 19:59:58 +0000 (-0800)
Subject: Merge branch 'jk/fetch-reflog-df-conflict'
X-Git-Tag: v2.2.0-rc2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbebdc1dcaf4a004391c7148ac1ce32b2d4633ee;p=thirdparty%2Fgit.git

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
---

bbebdc1dcaf4a004391c7148ac1ce32b2d4633ee
diff --cc t/t1410-reflog.sh
index 976c1d4277,3b657c4226..8cf446165e
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@@ -245,28 -245,20 +245,28 @@@ test_expect_success 'gc.reflogexpire=fa
  
  '
  
 +test_expect_success 'checkout should not delete log for packed ref' '
 +	test $(git reflog master | wc -l) = 4 &&
 +	git branch foo &&
 +	git pack-refs --all &&
 +	git checkout foo &&
 +	test $(git reflog master | wc -l) = 4
 +'
 +
  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
  '