git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Ciaran <ciaranj@gmail.com>, Elijah Newren <newren@gmail.com>,
	git@vger.kernel.org
Subject: Re: [BUG] merge-recursive triggered "BUG"
Date: Thu, 19 May 2011 20:21:07 -0700	[thread overview]
Message-ID: <7v1uzu5a70.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <BANLkTimNnRrJ_2UJUSWWd1QS=e0YH2p=_Q@mail.gmail.com> (Jay Soffian's message of "Thu, 19 May 2011 21:14:53 -0400")

Jay Soffian <jaysoffian@gmail.com> writes:

> On Wed, Mar 16, 2011 at 8:39 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> As a part of my today's merge, I used 'next' that contains b2c8c0a
>> (merge-recursive: When we detect we can skip an update, actually skip it,
>> 2011-02-28) to merge 'maint' into 'master' to propagate older releases up.
>>
>> It triggered a "BUG" per merged path, and I bisected this breakage down to
>> the said commit. Luckily 'master' is not contaminated with the breakage,
>> so I used it to finish today's work.
>
> I just ran into this. It's not in a repo I can share however. But, why
> did b2c8c0a make it into master with this known issue?

Because it was patched by another band-aid, and apparently it was not
enough?

You are the second person to report the same regression, so let's revert
the merge of the entire topic, ac9666f (Merge branch 'en/merge-recursive',
2011-04-28) from master for now.

Thanks.

  parent reply	other threads:[~2011-05-20  3:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-17  0:39 [BUG] merge-recursive triggered "BUG" Junio C Hamano
2011-03-17 21:45 ` Junio C Hamano
2011-03-18  6:07   ` [PATCH] merge-recursive: tweak magic band-aid Junio C Hamano
2011-03-21 18:24     ` Elijah Newren
2011-05-20  1:14 ` [BUG] merge-recursive triggered "BUG" Jay Soffian
2011-05-20  1:17   ` Jay Soffian
2011-05-20  3:21   ` Junio C Hamano [this message]
2011-05-20 12:29     ` Jay Soffian
2011-05-20 13:00       ` Jay Soffian

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=7v1uzu5a70.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=ciaranj@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jaysoffian@gmail.com \
    --cc=newren@gmail.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).