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>
Charvi Mendiratta committed
Mar 15, 2021 at 13:24 UTC
8bedae4599fafa8ae8b2885454db7c4bb7660aeb
1 file changed
+3
-27
t/t3437-rebase-fixup-options.sh
+3
-27
@@ -72,40 +72,16 @@ test_expect_success 'setup' '
72
git commit --fixup=HEAD -a &&
73
git tag B1 &&
74
test_tick &&
75
- git commit --allow-empty -F - <<-EOF &&
76
- amend! B
77
- $EMPTY
78
- B
79
- $EMPTY
80
- edited 1
81
- EOF
75
+ FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
76
test_tick &&
83
- git commit --allow-empty -F - <<-EOF &&
84
- amend! amend! B
85
- $EMPTY
86
- B
87
- $EMPTY
88
- edited 1
89
- $EMPTY
90
- edited 2
91
- EOF
77
+ FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
78
echo B2 >B &&
79
test_tick &&
80
FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
81
git tag B2 &&
82
echo B3 >B &&
83
test_tick &&
98
- git commit -a -F - <<-EOF &&
99
- amend! amend! amend! B
100
- $EMPTY
101
- B
102
- $EMPTY
103
- edited 1
104
- $EMPTY
105
- edited 2
106
- $EMPTY
107
- edited 3
108
- EOF
84
+ FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
85
git tag B3 &&
86
87
GIT_AUTHOR_NAME="Rebase Author" &&