From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 22:19:47 +0000 (-0700)
Subject: t/t4014: test "am -3" with mode-only change.
X-Git-Tag: v1.5.3.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cd894ee9adf0c026b74761d7b1c0d8dabe4ff4e1;p=git.git

t/t4014: test "am -3" with mode-only change.

Earlier commit ece7b74903007cee8d280573647243d46a6f3a95 added a test
for rebase that uses "am -3", but this adds a test to check "am -3"
itself.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index df969bb69..0a6fe5337 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -10,12 +10,15 @@ test_description='Format-patch skipping already incorporated patches'
 test_expect_success setup '
 
 	for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
-	git add file &&
+	cat file >elif &&
+	git add file elif &&
 	git commit -m Initial &&
 	git checkout -b side &&
 
 	for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
-	git update-index file &&
+	chmod +x elif &&
+	git update-index file elif &&
+	git update-index --chmod=+x elif &&
 	git commit -m "Side changes #1" &&
 
 	for i in D E F; do echo "$i"; done >>file &&