All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anders Kaseorg <andersk@mit.edu>
To: Elijah Newren <newren@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: v2.25 regression: cherry-pick alters patch and leaves working tree dirty
Date: Sun, 13 Jun 2021 00:45:33 -0700	[thread overview]
Message-ID: <9ef09567-d69c-0fba-a09c-70095a21a3a9@mit.edu> (raw)
In-Reply-To: <CABPp-BGDfucqae=HNES_QmmsjpDbdHrR6CG=H3gtiDygHzquVg@mail.gmail.com>

On 6/12/21 11:57 PM, Elijah Newren wrote:
> There's two bugs here, and they actually predate v2.25.  If you put
> all your files in a subdirectory (e.g. 'subdir/bar' instead of 'bar'
> and 'subdir/dir/bar' instead of 'dir/bar'), then the same bug
> reproduces going back many more versions.  The changes in v2.25 to
> support directory rename detection of a subdirectory to the root just
> allowed this bug to happen at the toplevel as well.

You’re right.  I’m sure you’ve already done this bisect, but for 
posterity, after that modification to the test case (‘mkdir subdir; cd 
subdir’ after ‘git init’), it reproduces back as far as 
9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 (v2.18.0-rc0~2^2~20) 
“merge-recursive: apply necessary modifications for directory renames”.

Thanks for the quick investigation!

Anders

  reply	other threads:[~2021-06-13  7:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-12  7:34 v2.25 regression: cherry-pick alters patch and leaves working tree dirty Anders Kaseorg
2021-06-13  6:57 ` Elijah Newren
2021-06-13  7:45   ` Anders Kaseorg [this message]
2021-06-26 17:14     ` Elijah Newren

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=9ef09567-d69c-0fba-a09c-70095a21a3a9@mit.edu \
    --to=andersk@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.