Re: Bug? git commit fileA tries to delete fileB and other oddities

[Mikael Simonsson <m@mikaelsimonsson.com>]

Hi Johannes,

I will try to recreate the problem with a new repository.

So far I think I've narrowed it down to a bug introduced in git 2.20.0.

Not buggy:
1.9.5
2.7.1
2.11.0
2.15.0
2.18.0
2.19.0
2.19.2
2.19.3

Buggy:
2.20.0
2.21.1
2.23.0 (Mac)
2.24.0
2.24.1

The buggy versions all try to delete fileX when running "git commit fileA":

% git commit fileA

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# Your branch is up to date with 'origin/master'.
#
# Changes to be committed:
#       deleted:    fileX
#       modified:   fileA
#
# Changes not staged for commit:


Kind regards,
Mikael


On Sun, Dec 15, 2019 at 9:10 PM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
> Hi Mikael,
>
> On Sat, 14 Dec 2019, Mikael Simonsson wrote:
>
> > I have the following problems with a local repository:
> >
> > * git commit fileA tries to delete fileX (fileX still exists).
> >
> > * git restore --staged fileX doesn't work, the file remains staged.
> >
> > * A commit from a few days back deleted 2 random files that I haven't
> > touched or staged in months and pulled in staged changes I didn't ask
> > for.
> >
> > git version: 2.24.0 and 2.24.1 (OS: FreeBSD 12)
> >
> > How can this happen? The repository has a local remote (on the same
> > filesystem) that is pushed to only. I tarred the project and copied it
> > to a Mac with git 2.23.0 and the problem persists.
>
> It would be good if you could come up with a minimal list of commands to
> recreate that problem. That way, we can turn it into a regression test and
> fix the problem.
>
> Ciao,
> Johannes
>
> >
> > For example (I've only changed the filenames):
> >
> > % git status
> > On branch master
> > Your branch is up to date with 'origin/master'.
> >
> > Changes to be committed:
> >   (use "git restore --staged <file>..." to unstage)
> >         modified:   fileA
> >         modified:   fileB
> >         modified:   fileC
> >
> > Changes not staged for commit:
> >   (use "git add/rm <file>..." to update what will be committed)
> >   (use "git restore <file>..." to discard changes in working directory)
> >         ...
> >
> >
> > % git commit fileA
> >
> > # Please enter the commit message for your changes. Lines starting
> > # with '#' will be ignored, and an empty message aborts the commit.
> > #
> > # On branch master
> > # Your branch is up to date with 'origin/master'.
> > #
> > # Changes to be committed:
> > #       deleted:    fileX
> > #       modified:   fileA
> > #
> > # Changes not staged for commit:
> >
> >
> > % git stash
> > Saved working directory and index state WIP on master: 488e7081 ...
> >
> >
> > % git status
> > On branch master
> > Your branch is up to date with 'origin/master'.
> >
> > Changes to be committed:
> >   (use "git restore --staged <file>..." to unstage)
> >         deleted:    fileX
> >
> > Untracked files:
> >
> >
> > % git restore --staged fileX
> >
> >
> > % git status
> > On branch master
> > Your branch is up to date with 'origin/master'.
> >
> > Changes to be committed:
> >   (use "git restore --staged <file>..." to unstage)
> >         deleted:    fileX
> >
> > Untracked files:
> >   (use "git add <file>..." to include in what will be committed)
> >
> >
> > Thanks,
> > Mikael
> >