diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-05-18 23:08:01 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-05-18 23:39:35 +0300 |
| commit | 3a1c05672eb72dcf5521619fb7795b2caeec4e0d (patch) | |
| tree | 5de1521daef273d8087068b7fdf58c9b4734dbea | |
| parent | b9b1d93b182cf1a7a48feb23819222f540bdfa18 (diff) | |
| download | git-3a1c05672eb72dcf5521619fb7795b2caeec4e0d.tar.gz | |
rebase: test ack
test ack! handling
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rwxr-xr-x | t/t3415-rebase-autosquash.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 41370ab998..9d7db1335a 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 && |