From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?J=C3=B6rg=20Sommer?= Subject: [PATCH v2 3/5] =?utf-8?q?Check=20for=20non=E2=80=90foreign=20commits=20in=20rebase-interactive=20test?= Date: Sat, 22 Mar 2008 15:08:25 +0100 Message-ID: <1206194907-3340-3-git-send-email-joerg@alea.gnuu.de> References: <1206148785-29466-1-git-send-email-joerg@alea.gnuu.de> <1206194907-3340-1-git-send-email-joerg@alea.gnuu.de> <1206194907-3340-2-git-send-email-joerg@alea.gnuu.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: gitster@pobox.com, =?utf-8?q?J=C3=B6rg=20Sommer?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Mar 22 15:11:31 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jd4RH-00053I-Kw for gcvg-git-2@gmane.org; Sat, 22 Mar 2008 15:11:16 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754512AbYCVOKJ convert rfc822-to-quoted-printable (ORCPT ); Sat, 22 Mar 2008 10:10:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754456AbYCVOKH (ORCPT ); Sat, 22 Mar 2008 10:10:07 -0400 Received: from banki.eumelnet.de ([83.246.114.63]:1555 "EHLO uucp.gnuu.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754391AbYCVOJs (ORCPT ); Sat, 22 Mar 2008 10:09:48 -0400 Received: by uucp.gnuu.de (Postfix, from userid 10) id A3D3FEC062; Sat, 22 Mar 2008 15:09:46 +0100 (CET) Received: from ibook.localnet ([192.168.0.5] helo=alea.gnuu.de) by alea.gnuu.de with esmtp (Exim 4.63) (envelope-from ) id 1Jd4OY-0002Ls-Pz; Sat, 22 Mar 2008 15:08:26 +0100 Received: from joerg by alea.gnuu.de with local (Exim 4.69) (envelope-from ) id 1Jd4OZ-0000sO-V4; Sat, 22 Mar 2008 15:08:28 +0100 X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1206194907-3340-2-git-send-email-joerg@alea.gnuu.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: J=C3=B6rg Sommer --- 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= =2Esh 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 squashi= ng' ' =20 test_expect_success '-p handles "no changes" gracefully' ' HEAD=3D$(git rev-parse HEAD) && - git rebase -i -p HEAD^ && + EXPECT_COUNT=3D1 git rebase -i -p HEAD^ && test $HEAD =3D $(git rev-parse HEAD) ' =20 @@ -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=3D3 git rebase -i -p --onto branch1 master && test $(git rev-parse HEAD^^2) =3D $(git rev-parse to-be-preserved) && test $(git rev-parse HEAD~3) =3D $(git rev-parse branch1) && test $(git show HEAD:file1) =3D C && --=20 1.5.4.4