diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 15:19:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 15:19:47 -0700 |
| commit | cd894ee9adf0c026b74761d7b1c0d8dabe4ff4e1 (patch) | |
| tree | a57b14593c63e64d49646dbf7ff696a4c4f1ac7e | |
| parent | 3d845d77639a8f91b9774b830d1a2d986a791489 (diff) | |
| download | git-cd894ee9adf0c026b74761d7b1c0d8dabe4ff4e1.tar.gz git-cd894ee9adf0c026b74761d7b1c0d8dabe4ff4e1.tar.xz | |
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>
| -rwxr-xr-x | t/t4014-format-patch.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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 && |