t/t4014: test "am -3" with mode-only change.
Earlier commit ece7b74903
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>
This commit is contained in:
parent
3d845d7763
commit
cd894ee9ad
@ -10,12 +10,15 @@ test_description='Format-patch skipping already incorporated patches'
|
|||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
|
|
||||||
for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
|
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 commit -m Initial &&
|
||||||
git checkout -b side &&
|
git checkout -b side &&
|
||||||
|
|
||||||
for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
|
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" &&
|
git commit -m "Side changes #1" &&
|
||||||
|
|
||||||
for i in D E F; do echo "$i"; done >>file &&
|
for i in D E F; do echo "$i"; done >>file &&
|
||||||
|
Loading…
Reference in New Issue
Block a user