mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 15:46:21 +02:00
Code

t3437: use --fixup with options to create amend! commit 

We taught `git commit --fixup` to create "amend!" commit. Let's also
update the tests and use it to setup the rebase tests.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charvi Mendiratta 2021-03-15 13:24:35 +05:30 committed by Junio C Hamano
parent 3d1bda6b5b
commit 8bedae4599
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
t/t3437-rebase-fixup-options.sh
View File

@ -72,40 +72,16 @@ test_expect_success 'setup' '
git commit --fixup=HEAD -a &&
git tag B1 &&
test_tick &&
git commit --allow-empty -F - <<-EOF &&
amend! B
$EMPTY
B
$EMPTY
edited 1
EOF
FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
test_tick &&
git commit --allow-empty -F - <<-EOF &&
amend! amend! B
$EMPTY
B
$EMPTY
edited 1
$EMPTY
edited 2
EOF
FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
echo B2 >B &&
test_tick &&
FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
git tag B2 &&
echo B3 >B &&
test_tick &&
git commit -a -F - <<-EOF &&
amend! amend! amend! B
$EMPTY
B
$EMPTY
edited 1
$EMPTY
edited 2
$EMPTY
edited 3
EOF
FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
git tag B3 &&
GIT_AUTHOR_NAME="Rebase Author" &&