From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: tweak magic band-aid
Date: Mon, 21 Mar 2011 12:24:12 -0600 [thread overview]
Message-ID: <AANLkTik8qaiu0NeM4oyuOvWXtw5QzamQxoyENAUsQxj3@mail.gmail.com> (raw)
In-Reply-To: <7v1v250xnr.fsf_-_@alter.siamese.dyndns.org>
Hi,
On Fri, Mar 18, 2011 at 12:07 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Running checks against working tree (e.g. lstat()) and causing
> changes to working tree (e.g. unlink()) while building a virtual
> ancestor merge does not make any sense. Avoid doing so.
>
> This is not a real fix; it is another magic band-aid on top of
> another band-aid we placed earlier.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sorry for not responding sooner; thanks for fixing this up, though.
Also, I have to apologize for having left a bunch of changes on my
harddrive for several months; one of those changes includes the first
half of your patch (which I should have remembered and not made the
problem worse with my more recent patch submission.) I just never got
around to cleaning up those changes and getting them submitted. Maybe
I should just send what I do have for now, and then send the cleaned
up version when I get a good chunk of time in another month or two.
> merge-recursive is riddled with places that touch/inspect working tree
> when it shouldn't, and it is beyond salvage without a major refactoring
> in its current shape, so this magic band-aid should do for now.
Yeah, I agree this needs to be fixed up. If no one else takes a look,
I'll try to when I get back to my other changes.
next prev parent reply other threads:[~2011-03-21 18:24 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 [this message]
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
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=AANLkTik8qaiu0NeM4oyuOvWXtw5QzamQxoyENAUsQxj3@mail.gmail.com \
--to=newren@gmail.com \
--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).