From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:40:57 +0000 (-0700)
Subject: Merge branch 'tr/test-commit-only-on-orphan' into maint
X-Git-Tag: v1.8.3.4~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8589a74b191f1842b633020e28de1c4a1c7f607c?hp=509152d3fa543bd3e030825ecefda298bbc4dfa7

Merge branch 'tr/test-commit-only-on-orphan' into maint

* tr/test-commit-only-on-orphan:
Test 'commit --only' after 'checkout --orphan'
---

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 195e7477d8..99ce36f5ef 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -524,4 +524,17 @@ test_expect_success 'commit a file whose name is a dash' '
 	test_i18ngrep " changed, 5 insertions" output
 '
 
+test_expect_success '--only works on to-be-born branch' '
+	# This test relies on having something in the index, as it
+	# would not otherwise actually prove much.  So check this.
+	test -n "$(git ls-files)" &&
+	git checkout --orphan orphan &&
+	echo foo >newfile &&
+	git add newfile &&
+	git commit --only newfile -m"--only on unborn branch" &&
+	echo newfile >expected &&
+	git ls-tree -r --name-only HEAD >actual &&
+	test_cmp expected actual
+'
+
 test_done