From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Nikolay Kasyanov <corrmage@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: A rebase regression in Git 2.18.0
Date: Tue, 28 Aug 2018 15:33:24 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1808281532220.16620@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <87in3ueiks.fsf@evledraar.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3138 bytes --]
Hi,
On Tue, 28 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Aug 28 2018, Nikolay Kasyanov wrote:
>
> > I’ve found something that may be a regression in git rebase implementation in 2.18.0.
> > First I spotted it on macOS but I can also confirm it happening on Linux.
> > Git 2.19.0.rc0.48.gb9dfa238d is affected too.
> >
> > In order to trigger it, a repo layout similar to the following is required:
> >
> > files/
> > file1
> > file2
> > file3
> > file4
> > file5
> > project
> >
> > Let’s call this state baseline. Then, in a branch, let’s edit project file and move file3 to nested/files subdirectory, here’s the final layout:
> >
> > files/
> > file1
> > file2
> > file4
> > file5
> > nested/
> > files/
> > file3
> > project
> >
> > Let’s get back to master and also edit project file to cause a conflict. After that trying to rebase the branch upon master will cause the following git status output:
> >
> > rebase in progress; onto baf8d2a
> > You are currently rebasing branch 'branch' on 'baf8d2a'.
> > (fix conflicts and then run "git rebase --continue")
> > (use "git rebase --skip" to skip this patch)
> > (use "git rebase --abort" to check out the original branch)
> >
> > Changes to be committed:
> > (use "git reset HEAD <file>..." to unstage)
> >
> > renamed: files/file1 -> nested/files/file1
> > renamed: files/file2 -> nested/files/file2
> > renamed: files/file3 -> nested/files/file3
> > renamed: files/file4 -> nested/files/file4
> > renamed: files/file5 -> nested/files/file5
> >
> > Unmerged paths:
> > (use "git reset HEAD <file>..." to unstage)
> > (use "git add <file>..." to mark resolution)
> >
> > both modified: project
> >
> > All renames except file3 are invalid and shouldn’t be here.
> > Here’s how the output looks like produced by an older Git version (git version 2.15.1):
> >
> > rebase in progress; onto baf8d2a
> > You are currently rebasing branch 'branch' on 'baf8d2a'.
> > (fix conflicts and then run "git rebase --continue")
> > (use "git rebase --skip" to skip this patch)
> > (use "git rebase --abort" to check out the original branch)
> >
> > Changes to be committed:
> > (use "git reset HEAD <file>..." to unstage)
> >
> > renamed: files/file3 -> nested/files/file3
> >
> > Unmerged paths:
> > (use "git reset HEAD <file>..." to unstage)
> > (use "git add <file>..." to mark resolution)
> >
> > both modified: project
> >
> > Here’s a ready-to-use repository: https://github.com/nikolaykasyanov/git-rebase-bug.
>
> Thanks for the test case. This bisects down to 9c0743fe1e
> ("merge-recursive: apply necessary modifications for directory renames",
> 2018-04-19) first released as part of 2.18.0.
>
> I have not dug to see if the behavior change is desired or not, that
> commit changed the results of a bunch of test cases, maybe it was
> intended. Elijah?
I think this was already mentioned before, in a different mail thread:
have you tried whether `git rebase -m` fixes that behavior?
Ciao,
Johannes
next prev parent reply other threads:[~2018-08-28 13:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 12:27 A rebase regression in Git 2.18.0 Nikolay Kasyanov
2018-08-28 13:17 ` Ævar Arnfjörð Bjarmason
2018-08-28 13:33 ` Johannes Schindelin [this message]
2018-08-28 13:46 ` Nikolay Kasyanov
2018-08-28 15:35 ` Elijah Newren
2018-08-28 16:58 ` Junio C Hamano
2018-08-29 7:06 ` [PATCH 0/3] Turn off directory rename detection in am -3 Elijah Newren
2018-08-29 7:06 ` [PATCH 1/3] t3401: add another directory rename testcase for rebase and am Elijah Newren
2018-08-29 22:12 ` Junio C Hamano
2018-08-29 23:47 ` Elijah Newren
2018-08-30 16:01 ` Junio C Hamano
2018-08-30 16:26 ` Elijah Newren
2018-08-29 7:06 ` [PATCH 2/3] merge-recursive: add ability to turn off directory rename detection Elijah Newren
2018-08-29 12:54 ` Johannes Schindelin
2018-08-29 23:00 ` Elijah Newren
2018-08-29 7:06 ` [PATCH 3/3] am: avoid directory rename detection when calling recursive merge machinery Elijah Newren
2018-08-29 12:51 ` Johannes Schindelin
2018-08-30 16:41 ` A rebase regression in Git 2.18.0 Elijah Newren
2018-08-31 10:11 ` Johannes Schindelin
2018-08-31 19:37 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1808281532220.16620@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=corrmage@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).