From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
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: Mon, 21 Feb 2011 15:33:14 -0800 [thread overview]
Message-ID: <7vzkppgdz9.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 20110219102051.GA22508@sigill.intra.peff.net
Jeff King <peff@peff.net> writes:
> The warning is generated deep in the diffcore code, which
> means that it will come first, followed possibly by a spew
> of conflicts, making it hard to see.
>
> Instead, let's have diffcore pass back the information about
> how big the rename limit would needed to have been, and then
> the caller can provide a more appropriate message (and at a
> more appropriate time).
>
> No refactoring of other non-merge callers is necessary,
> because nobody else was even using the warn_on_rename_limit
> feature.
>
> Signed-off-by: Jeff King <peff@peff.net>
Thanks.
This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C
busts the rename limit, 2011-01-06) on 'pu', unfortunately.
next prev parent reply other threads:[~2011-02-21 23:33 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 [this message]
2011-02-22 15:39 ` Jeff King
2011-02-22 18:46 ` Junio C Hamano
2011-02-23 8:02 ` Jeff King
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=7vzkppgdz9.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=peff@peff.net \
--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).