git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jörg Sommer" <joerg@alea.gnuu.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com, "Jörg Sommer" <joerg@alea.gnuu.de>
Subject: [PATCH v2 3/5] Check for non‐foreign commits in rebase-interactive test
Date: Sat, 22 Mar 2008 15:08:25 +0100	[thread overview]
Message-ID: <1206194907-3340-3-git-send-email-joerg@alea.gnuu.de> (raw)
In-Reply-To: <1206194907-3340-2-git-send-email-joerg@alea.gnuu.de>


Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
 t/t3404-rebase-interactive.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8de1f21..8a801a0 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -185,7 +185,7 @@ test_expect_success 'retain authorship when squashing' '
 
 test_expect_success '-p handles "no changes" gracefully' '
 	HEAD=$(git rev-parse HEAD) &&
-	git rebase -i -p HEAD^ &&
+	EXPECT_COUNT=1 git rebase -i -p HEAD^ &&
 	test $HEAD = $(git rev-parse HEAD)
 '
 
@@ -208,7 +208,7 @@ test_expect_success 'preserve merges with -p' '
 	test_tick &&
 	git commit -m K file1 &&
 	test_tick &&
-	git rebase -i -p --onto branch1 master &&
+	EXPECT_COUNT=3 git rebase -i -p --onto branch1 master &&
 	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) = C &&
-- 
1.5.4.4

  reply	other threads:[~2008-03-22 14:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-22  1:19 [PATCH] rebase with preserve merges should not show merged commits Jörg Sommer
2008-03-22  1:19 ` [PATCH] Check for non‐foreign commits in rebase-interactive test Jörg Sommer
2008-03-22  1:19   ` [PATCH] Handle fast forward correctly in rebase with preserve merges Jörg Sommer
2008-03-22  1:19     ` [PATCH] New tests to check " Jörg Sommer
2008-03-22  1:33 ` [PATCH] rebase with preserve merges should not show merged commits Johannes Schindelin
2008-03-22  9:43   ` Jörg Sommer
2008-03-22 11:22     ` Johannes Schindelin
2008-03-22  1:52 ` Björn Steinbrink
2008-03-22  9:40   ` Jörg Sommer
2008-03-22 12:37     ` Björn Steinbrink
2008-03-22 14:06   ` Jörg Sommer
2008-03-22 15:12     ` Björn Steinbrink
2008-03-22 15:37       ` Jörg Sommer
2008-03-22 14:08 ` [PATCH v2 1/5] " Jörg Sommer
2008-03-22 14:08   ` [PATCH v2 2/5] New test: no merges without preserve merges Jörg Sommer
2008-03-22 14:08     ` Jörg Sommer [this message]
2008-03-22 14:08       ` [PATCH v2 4/5] Handle fast forward correctly in rebase with " Jörg Sommer
2008-03-22 14:08         ` [PATCH v2 5/5] New tests to check " Jörg Sommer
2008-03-22 14:46   ` [PATCH v2 1/5] rebase with preserve merges should not show merged commits Johannes Schindelin

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=1206194907-3340-3-git-send-email-joerg@alea.gnuu.de \
    --to=joerg@alea.gnuu.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).