From: "Jörg Sommer" <joerg@alea.gnuu.de>
To: git@vger.kernel.org
Cc: B.Steinbrink@gmx.de, "Jörg Sommer" <joerg@alea.gnuu.de>
Subject: [PATCH 3/3] Improve failure test for preserve merges
Date: Sat, 22 Mar 2008 22:44:26 +0100 [thread overview]
Message-ID: <1206222266-29179-3-git-send-email-joerg@alea.gnuu.de> (raw)
In-Reply-To: <1206222266-29179-2-git-send-email-joerg@alea.gnuu.de>
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
t/t3404-rebase-interactive.sh | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 014b036..eaa2fc0 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -213,11 +213,13 @@ test_expect_success 'preserve merges with -p' '
'
test_expect_failure 'preserve merges with -p (case 2)' '
- old_head=$(git rev-parse HEAD) &&
test_tick &&
- EXPECT_COUNT=4 FAKE_LINES="1 4 3 edit 2" git rebase -i -p branch1 &&
- git rebase --continue &&
- test $(git rev-parse HEAD) != $old_head
+ EXPECT_COUNT=4 FAKE_LINES="1 4 3 edit 2" git rebase -i -v -p branch1 &&
+ git rebase --continue
+ test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
+ test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
+ test $(git show HEAD:file1) = B &&
+ test $(git show HEAD~2:file1) = C
'
# clean-up from the above test
--
1.5.4.4
next prev parent reply other threads:[~2008-03-22 22:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-22 21:44 [PATCH 1/3] Add test for rebase interactive with preserve merges Jörg Sommer
2008-03-22 21:44 ` [PATCH 2/3] Change rebase with preserver merges to pick up the right new HEAD Jörg Sommer
2008-03-22 21:44 ` Jörg Sommer [this message]
2008-03-22 21:57 ` [PATCH 3/3] Improve failure test for preserve merges Jörg Sommer
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=1206222266-29179-3-git-send-email-joerg@alea.gnuu.de \
--to=joerg@alea.gnuu.de \
--cc=B.Steinbrink@gmx.de \
--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).