From: "Michael S. Tsirkin" <mst@redhat.com>
To: git@vger.kernel.org
Subject: [PATCH 3/4] rebase: test ack
Date: Mon, 19 May 2014 00:17:51 +0300 [thread overview]
Message-ID: <1400447743-18513-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1400447743-18513-1-git-send-email-mst@redhat.com>
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
next prev parent reply other threads:[~2014-05-18 21:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-18 21:17 [PATCH 0/4] ack recoding in commit log Michael S. Tsirkin
2014-05-18 21:17 ` [PATCH 1/4] rebase -i: add ack action Michael S. Tsirkin
2014-05-18 21:17 ` [PATCH 2/4] git-rebase: document ack Michael S. Tsirkin
2014-05-18 23:43 ` Eric Sunshine
2014-05-18 21:17 ` Michael S. Tsirkin [this message]
2014-05-19 21:34 ` [PATCH 3/4] rebase: test ack Junio C Hamano
2014-05-19 22:40 ` Michael S. Tsirkin
2014-05-20 14:38 ` Michael S. Tsirkin
2014-05-20 15:13 ` Junio C Hamano
2014-05-21 12:52 ` Michael S. Tsirkin
2014-05-21 16:54 ` Junio C Hamano
2014-05-21 17:39 ` Michael S. Tsirkin
2014-05-21 18:30 ` Junio C Hamano
2014-05-18 21:17 ` [PATCH 4/4] git-ack: record an ack Michael S. Tsirkin
2014-06-03 23:53 ` Fabian Ruch
2014-06-11 8:05 ` [PATCH 0/4] ack recoding in commit log Fabian Ruch
2014-06-11 8:46 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2016-04-10 13:54 [PATCH 0/4] support for ack commits Michael S. Tsirkin
2016-04-10 13:54 ` [PATCH 3/4] rebase: test ack Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400447743-18513-4-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).