From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, Stephen Rothwell <sfr@canb.auug.org.au>,
Jeff King <peff@peff.net>
Subject: Re: [PATCHv2 3/3] merge-recursive: When we detect we can skip an update, actually skip it
Date: Wed, 02 Mar 2011 15:23:53 -0800 [thread overview]
Message-ID: <7v1v2payye.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTin1EDUMRY7T+Jx64eG6R4mOZOeOukJWQHpFX+j5@mail.gmail.com> (Elijah Newren's message of "Wed\, 2 Mar 2011 15\:22\:49 -0700")
Elijah Newren <newren@gmail.com> writes:
> Suggestions?
Other than not doing the remove way before the code knows that it is
necessary to get rid of the path because there needs to be a directory?
No.
Personally, I've long given up on d/f conflict codepath in merge-recursive
as unsalvageable, short of a total rewrite. As I said in the other
message, the patch you sent in is a good enough fix within the context of
the current code.
next prev parent reply other threads:[~2011-03-02 23:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 1:08 [PATCHv2 0/3] Fix unnecessary (mtime) updates of files during merge Elijah Newren
2011-03-01 1:08 ` [PATCHv2 1/3] t6022: New test checking for unnecessary updates of renamed+modified files Elijah Newren
2011-03-01 7:33 ` Johannes Sixt
2011-03-01 19:38 ` Jeff King
2011-03-02 22:26 ` Elijah Newren
2011-03-01 1:08 ` [PATCHv2 2/3] t6022: New test checking for unnecessary updates of files in D/F conflicts Elijah Newren
2011-03-01 1:08 ` [PATCHv2 3/3] merge-recursive: When we detect we can skip an update, actually skip it Elijah Newren
2011-03-02 20:19 ` Junio C Hamano
2011-03-02 22:22 ` Elijah Newren
2011-03-02 23:23 ` Junio C Hamano [this message]
2011-03-01 19:31 ` [PATCHv2 0/3] Fix unnecessary (mtime) updates of files during merge Jeff King
2011-03-01 19:36 ` Jeff King
2011-03-02 23:11 ` Elijah Newren
2011-03-02 23:22 ` Junio C Hamano
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=7v1v2payye.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=sfr@canb.auug.org.au \
/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).