From: Mikael Simonsson <m@mikaelsimonsson.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: Bug? git commit fileA tries to delete fileB and other oddities
Date: Tue, 17 Dec 2019 11:04:50 +0000 [thread overview]
Message-ID: <CA+PLxnVzu0zDtpT2T660UGhZ0RvFcq50nPfZz9Que7_7mqiSyQ@mail.gmail.com> (raw)
In-Reply-To: <20191217073306.GA3313061@coredump.intra.peff.net>
git bisect made that pretty easy, thanks. It looks like it started
with this commit:
"unpack-trees: optimize walking same trees with cache-tree"
https://github.com/git/git/commit/b4da37380b7774248086f42bcd59397a44e1ac79
(I ran git bisect between tags v2.19.2 and v2.20.0.)
Testing the commit in question:
% git checkout b4da37380b7774248086f42bcd59397a44e1ac79
% gmake -j 6 NO_OPENSSL=YesPlease NO_PERL=YesPlease NO_TCLTK=YesPlease
NO_GETTEXT=YesPlease NO_EXPAT=YesPlease all
% ~/tmp/git-source/git version
git version 2.18.0.751.gb4da37380b
% ~/tmp/git-source/git commit null_terminated.hh
# 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: algo/find.hh
# new file: app/.reserved
# deleted: ascii/contains_icase.hh
# deleted: ascii/contains_icase.test.cc
# modified: null_terminated.hh
#
# Changes not staged for commit:
Aborting commit due to empty commit message.
Note that the latest version behaves differently (it tries to delete
another file):
% git version
git version 2.24.1
% git commit null_terminated.hh
# 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: defer.hh
# modified: null_terminated.hh
Aborting commit due to empty commit message.
The commit before "unpack-trees: optimize walking same trees with
cache-tree" works as it should:
% git checkout b4da37380b7774248086f42bcd59397a44e1ac79^
% gmake -j 6 NO_OPENSSL=YesPlease NO_PERL=YesPlease NO_TCLTK=YesPlease
NO_GETTEXT=YesPlease NO_EXPAT=YesPlease all
% ~/tmp/git-source/git version
git version 2.18.0.750.g0d1ed5963d
% ~/tmp/git-source/git commit null_terminated.hh
# 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:
# modified: null_terminated.hh
#
# Changes not staged for commit:
Aborting commit due to empty commit message.
Here's my local commit from about a week ago when the problems started.
I'm sure I ran "git commit readme.md" because I had several files
staged. The commit pulled in 3 staged files (I think there were more)
and deleted 3 files that 100% weren't staged.
% git show --numstat 7d5d43d849f1391b3cc11f12e037b8cb5174e3a3
commit 7d5d43d849f1391b3cc11f12e037b8cb5174e3a3
Author: Mikael Simonsson <m@mikaelsimonsson.com>
Date: Sun Dec 8 10:38:38 2019 +0000
Add short info and requirements for ranges
56 0 algo/find.hh
0 1 app/.reserved
16 0 ascii/contains_icase.hh
28 0 ascii/contains_icase.test.cc
0 41 bench/bench.hh
0 41 debug.hh
76 0 readme.md
-Mikael
On Tue, Dec 17, 2019 at 7:33 AM Jeff King <peff@peff.net> wrote:
>
> On Mon, Dec 16, 2019 at 09:50:33AM +0000, Mikael Simonsson wrote:
>
> > 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:
> > [...]
>
> If you can build Git from source, you might try using "git bisect" to
> find the exact commit where the problem starts.
>
> > 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:
>
> Is there anything about "fileX" and "fileA"'s names that might be
> relevant? E.g., might they case-fold to the same name or something?
>
> -Peff
next prev parent reply other threads:[~2019-12-17 11:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 10:39 Bug? git commit fileA tries to delete fileB and other oddities Mikael Simonsson
2019-12-15 21:09 ` Johannes Schindelin
2019-12-16 9:50 ` Mikael Simonsson
2019-12-17 7:33 ` Jeff King
2019-12-17 11:04 ` Mikael Simonsson [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-14 13:16 Mikael Simonsson
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=CA+PLxnVzu0zDtpT2T660UGhZ0RvFcq50nPfZz9Que7_7mqiSyQ@mail.gmail.com \
--to=m@mikaelsimonsson.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).