git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Elijah Newren <newren@gmail.com>,
	gitster@pobox.com, git@vger.kernel.org, santi@agolina.net,
	Johannes.Schindelin@gmx.de
Subject: Re: [PATCHv2 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Date: Sun, 8 Aug 2010 16:43:58 -0500	[thread overview]
Message-ID: <20100808214358.GB6962@burratino> (raw)
In-Reply-To: <201008082336.18270.j6t@kdbg.org>

Johannes Sixt wrote:
> On Sonntag, 8. August 2010, Elijah Newren wrote:

>> +test_expect_success 'setup for avoiding reapplying old patches' '
>> +	(cd dst &&
>> +	 (git rebase --abort || true) &&
>
> Perhaps:
>
> 	test_might_fail git rebase --abort &&
>
> but I'm not sure whether that's the intended use of test_might_fail.

It is.  Thanks for noticing.

  reply	other threads:[~2010-08-08 21:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-08 19:04 [PATCHv2 0/2] Fix spurious conflicts with pull --rebase Elijah Newren
2010-08-08 19:04 ` [PATCHv2 1/2] t5520-pull: Add testcases showing spurious conflicts from git " Elijah Newren
2010-08-08 20:01   ` Ævar Arnfjörð Bjarmason
2010-08-08 20:17     ` Elijah Newren
2010-08-08 20:33       ` Ævar Arnfjörð Bjarmason
2010-08-08 21:36   ` Johannes Sixt
2010-08-08 21:43     ` Jonathan Nieder [this message]
2010-08-08 19:04 ` [PATCHv2 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches Elijah Newren

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=20100808214358.GB6962@burratino \
    --to=jrnieder@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=newren@gmail.com \
    --cc=santi@agolina.net \
    /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).