From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Martin Langhoff <martin.langhoff@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/4] merge: improve inexact rename limit warning
Date: Wed, 23 Feb 2011 03:02:33 -0500 [thread overview]
Message-ID: <20110223080232.GA2724@sigill.intra.peff.net> (raw)
In-Reply-To: <7vsjvfdhzy.fsf@alter.siamese.dyndns.org>
On Tue, Feb 22, 2011 at 10:46:57AM -0800, Junio C Hamano wrote:
> >> This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C
> >> busts the rename limit, 2011-01-06) on 'pu', unfortunately.
> >
> > Do you want to do the merge, or do you want me to rebase on top of
> > 2840824?
>
> Please check the resolution queued on 'pu'; I suspect that your series
> should graduate before the fall-back-to-c-from-c-c topic, so I'd rather
> not to see you rebase this.
It looks sane to me. I was going to say we should also have
merge-recursive check for the fallback-to-c flag and tell the user what
happened, but I don't think merge-recursive ever has FIND_COPIES_HARDER
enabled.
Which I think means in 2840824 itself, the warning about fallback can
never be triggered (because merge-recursive is the only caller who
turned on warn_on_too_large_rename).
-Peff
next prev parent reply other threads:[~2011-02-23 8:02 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 18:58 Merging limitations after directory renames -- interesting test repo Martin Langhoff
2011-02-18 22:21 ` Jeff King
2011-02-18 23:27 ` Linus Torvalds
2011-02-19 0:26 ` Linus Torvalds
2011-02-19 0:52 ` Junio C Hamano
2011-02-19 1:03 ` Linus Torvalds
2011-02-19 1:20 ` Linus Torvalds
2011-02-19 0:55 ` Linus Torvalds
2011-02-19 0:44 ` Junio C Hamano
2011-02-19 9:08 ` Jeff King
2011-02-19 10:19 ` Jeff King
2011-02-19 10:20 ` [PATCH 1/4] merge: improve inexact rename limit warning Jeff King
2011-02-21 23:33 ` Junio C Hamano
2011-02-22 15:39 ` Jeff King
2011-02-22 18:46 ` Junio C Hamano
2011-02-23 8:02 ` Jeff King [this message]
2011-02-19 10:21 ` [PATCH 2/4] bump rename limit defaults (again) Jeff King
2011-02-19 17:54 ` Piotr Krukowiecki
2011-02-20 10:10 ` Jeff King
2011-02-19 20:12 ` Ævar Arnfjörð Bjarmason
2011-02-20 10:12 ` Jeff King
2011-02-19 10:21 ` [PATCH 3/4] commit: stop setting rename limit Jeff King
2011-02-19 10:25 ` [RFC/PATCH 4/4] inexact rename detection eye candy Jeff King
2011-02-19 15:57 ` Linus Torvalds
2011-02-20 9:48 ` Jeff King
2011-02-20 9:51 ` [PATCH 1/3] add inexact rename detection progress infrastructure Jeff King
2011-02-20 9:53 ` [PATCH 2/3] merge: enable progress reporting for rename detection Jeff King
2011-02-20 9:56 ` [PATCH 3/3] pull: propagate --progress to merge Jeff King
2011-02-20 10:37 ` [RFC/PATCH 4/4] inexact rename detection eye candy Jeff King
2011-02-19 16:29 ` Martin Langhoff
2011-02-20 10:04 ` Jeff King
2011-02-20 13:16 ` Martin Langhoff
2011-02-19 15:22 ` Merging limitations after directory renames -- interesting test repo Martin Langhoff
2011-02-19 15:31 ` Martin Langhoff
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=20110223080232.GA2724@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.langhoff@gmail.com \
--cc=torvalds@linux-foundation.org \
/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).