From: Jeff King <peff@peff.net>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Peter Hunkeler <phunsoft@gmx.net>, Git Mailinglist <git@vger.kernel.org>
Subject: Re: Git not commiting anything if file created and "git add"ed in pre-commit hook is the only file in the staging area
Date: Wed, 27 Oct 2021 18:42:02 -0400 [thread overview]
Message-ID: <YXnVuhyPuFFfJ8zq@coredump.intra.peff.net> (raw)
In-Reply-To: <YXnNvyi62j5gcxQV@camp.crustytoothpaste.net>
On Wed, Oct 27, 2021 at 10:07:59PM +0000, brian m. carlson wrote:
> > Further testing shows that the newly created file *is* added to the
> > commit, *if* at least one other change
> > was registered to be commited (git add some time before the git commit).
>
> Yes, this occurs because the first thing we do is invoke the pre-commit
> hook. It passes, and then we consider various reasons why we should not
> commit: the hook failed, there's nothing to commit, etc. We discover
> one since we haven't re-read the index yet and last we saw there was
> nothing to commit, so we abort.
>
> There's a giant comment before we re-read the index that says this:
>
> /*
> * Re-read the index as pre-commit hook could have updated it,
> * and write it out as a tree. We must do this before we invoke
> * the editor and after we invoke run_status above.
> */
>
> The commit history does not explain why we must do this _after_ invoking
> run_status, but if the comment is incorrect and we re-read it
> immediately, then this problem would go away. I lack the relevant
> context to determine whether this is appropriate, but if folks think
> this is advisable, then I can write up a patch this weekend. It should
> be relatively trivial.
There's some related discussion of this area in:
https://lore.kernel.org/git/CADv3qkGq3jA8iXsjhrqfsUX=gW+KOuLyeVgDzmku1tUpsMdvtw@mail.gmail.com/
I don't find it particularly enlightening as to the history, but it does
point to other people wanting to re-read before run_status().
-Peff
next prev parent reply other threads:[~2021-10-27 22:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-27 19:03 Git not commiting anything if file created and "git add"ed in pre-commit hook is the only file in the staging area Peter Hunkeler
2021-10-27 22:07 ` brian m. carlson
2021-10-27 22:42 ` Jeff King [this message]
2021-10-28 1:32 ` Junio C Hamano
2021-10-28 12:08 ` Peter Hunkeler
2021-10-30 13:21 ` Peter Hunkeler
2021-10-30 16:44 ` Johannes Sixt
2021-10-30 21:25 ` Junio C Hamano
2021-11-02 13:13 ` Peter Hunkeler
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=YXnVuhyPuFFfJ8zq@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=phunsoft@gmx.net \
--cc=sandals@crustytoothpaste.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).