"Michael S. Tsirkin" <mst@xxxxxxxxxx> writes: > test ack! handling > > Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Will queue with this squashed in. 4/4 seems to have some style issues as well, but I didn't look very closely. Thanks. t/t3415-rebase-autosquash.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 9d7db13..dcdba6f 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -75,18 +75,18 @@ test_expect_success 'auto squash (option)' ' ' test_expect_success 'auto ack' ' - ack="Acked-by: xyz" - msg=$(test_write_lines "ack! first commit" "" "$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 + git show -s first-commit | grep -v ^commit >expected-msg && + echo " $ack" >>expected-msg && + git show -s HEAD^ | grep -v ^commit >actual-msg && + test_cmp actual-msg expected-msg ' test_expect_success 'auto squash (config)' ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html