From: Linus Torvalds <torvalds@linux-foundation.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Olaf Hering <olaf@aepfle.de>, Git Mailing List <git@vger.kernel.org>
Subject: Re: history damage in linux.git
Date: Thu, 21 Apr 2016 10:00:47 -0700 [thread overview]
Message-ID: <CA+55aFzk4rZFdhOjkPDqFC3_tk4BUvx4-STsY2L_tKMH2FxCCA@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFx8hPKKcuwe-HHoO7LHVYLmJ6khndd-OtQotMs3EJzZ0w@mail.gmail.com>
On Thu, Apr 21, 2016 at 9:36 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> This seems to be a git bug.
>
> That commit aed06b9 can also be described as
>
> v3.13-rc7~9^2~14^2~42
>
> so describing it as 'v4.6-rc1~9^2~792' is clearly not closer in any way.
Hmm. I think I see what's up. The git distance function has a special
hack for preferring first-parent traversal, introduced long long ago
with commit ac076c29ae8d ("name-rev: Fix non-shortest description").
Changing that
#define MERGE_TRAVERSAL_WEIGHT 65535
to be a smaller value makes git find the shorter path.
I do not know what the correct fix is, though.
Linus
next prev parent reply other threads:[~2016-04-21 17:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 11:30 history damage in linux.git Olaf Hering
2016-04-21 12:10 ` Matthieu Moy
2016-04-21 12:32 ` Olaf Hering
2016-04-21 12:51 ` Matthieu Moy
2016-04-21 13:19 ` John Keeping
2016-04-21 15:54 ` Olaf Hering
2016-04-21 16:36 ` Matthieu Moy
2016-04-21 13:24 ` Andreas Schwab
2016-04-21 16:36 ` Linus Torvalds
2016-04-21 16:59 ` Junio C Hamano
2016-04-21 17:08 ` Jeff King
2016-04-21 17:23 ` Linus Torvalds
2016-04-21 17:44 ` Stefan Beller
2016-04-21 22:16 ` Junio C Hamano
2016-04-21 18:05 ` Jeff King
2016-04-21 18:18 ` Linus Torvalds
2016-04-22 13:38 ` Johannes Schindelin
2016-04-21 17:00 ` Linus Torvalds [this message]
2016-04-21 17:23 ` Junio C Hamano
2016-04-21 17:43 ` Linus Torvalds
2016-04-21 17:59 ` Linus Torvalds
2016-04-21 18:09 ` Jeff King
2016-04-21 19:27 ` Junio C Hamano
2016-04-21 19:43 ` Linus Torvalds
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=CA+55aFzk4rZFdhOjkPDqFC3_tk4BUvx4-STsY2L_tKMH2FxCCA@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=schwab@linux-m68k.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).