git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Marco Giuliano <marco.giuliano@tesisquare.com>
To: git@vger.kernel.org
Subject: Nonexistent changes appear rebasing but only with rebase.backend=apply
Date: Fri, 18 Jun 2021 17:21:23 +0200	[thread overview]
Message-ID: <CANLwWg4hG=iv9qjOmGHSJ7z7Y+vvvP+x0o3DfR5bH5A-C6_7aQ@mail.gmail.com> (raw)

Hi All

I'm facing a strange anomaly during rebase.
I'll try to explain what happens because unfortunately I cannot share
more information since it's confidential and unfortunately an
anonymized export does not reproduce the issue.

I have the following repository status:

   * commit 2 (BRANCH X)
   |
   |  * commit 4 (BRANCH Y) (HEAD)
   |  |
   |  * commit 3
   | /
   |/
   * commit 1
   |
   |
 (...)

What I'm trying to do is rebasing branch Y on branch X, with the command:
git rebase X

The anomaly is that, among other expected conflicts, also two files
(fileA, fileB) appear modified in both branches, but those two files
have not been modified in any of the 4 commits you see in the graph
above!
The anomaly appears only with the config setting rebase.backend=apply,
while not with rebase.backend=merge (*).

This might not be caused by rebase command itself, but rather by some
previous operations which might have accidentally "broken" something
and that the rebase simply makes them appear.
You need to know that commit 4 is the result of several squash and
reordering of multiple commits; is it possible that some of those
operations have created some "leftovers" ?

I know this is difficult without seeing the actual repository, but
could you just give me some advice or point me to the place where I
can investigate ?

(*)
When the anomaly first appeared, I was using git for windows, version
< 2.26.0 (unfortunately I cannot recover the exact number); I decided
to upgrade git to 2.31.1 and the anomaly disappeared. Investigating
the release notes, I noticed that rebase.backend default value changed
from apply to rebase from version 2.26.0.
I also copied the repository on linux (with git 2.31.0), and the
behavior is the same.

Thanks in advance for any help,
Best Regards,
Marco

             reply	other threads:[~2021-06-18 15:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 15:21 Marco Giuliano [this message]
2021-06-18 23:44 ` Nonexistent changes appear rebasing but only with rebase.backend=apply Felipe Contreras
2021-06-20 18:02 ` Phillip Wood
2021-06-24 16:23   ` Marco Giuliano
2021-06-24 18:39     ` Phillip Wood
2021-06-25  7:12       ` Marco Giuliano
2021-06-26  7:53         ` Elijah Newren
2021-06-29 18:58           ` Marco Giuliano
2021-06-25 16:08 ` Felipe Contreras

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='CANLwWg4hG=iv9qjOmGHSJ7z7Y+vvvP+x0o3DfR5bH5A-C6_7aQ@mail.gmail.com' \
    --to=marco.giuliano@tesisquare.com \
    --cc=git@vger.kernel.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.
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).