[PATCH 3/4] rebase: test ack
test ack! handling
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
t/t3415-rebase-autosquash.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 41370ab..9d7db13 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -74,6 +74,21 @@ test_expect_success 'auto squash (option)' '
test_auto_squash final-squash --autosquash
'
+test_expect_success 'auto ack' '
+ ack="Acked-by: xyz"
+ msg=$(test_write_lines "ack! first commit" "" "$ack")
+ git reset --hard base &&
+ git commit --allow-empty -m "$msg" -- &&
+ git tag ack &&
+ test_tick &&
+ git rebase --autosquash -i HEAD^^^ &&
+ git log --oneline >actual &&
+ git show -s first-commit | grep -v ^commit > expected-msg &&
+ echo " $ack" >> expected-msg &&
+ git show -s HEAD^ | grep -v ^commit > actual-msg &&
+ diff actual-msg expected-msg
+'
+
test_expect_success 'auto squash (config)' '
git config rebase.autosquash true &&
test_auto_squash final-squash-config-true &&
--
MST