From: "C. Scott Ananian" <cscott@laptop.org>
To: git@vger.kernel.org
Subject: precommit hook broken with "git commit <filename>"
Date: Tue, 12 Apr 2011 11:17:10 -0400 [thread overview]
Message-ID: <BANLkTimB=TZ1gP-18ywbZUOZSbDamkRwCg@mail.gmail.com> (raw)
It appears that "git commit <filename>" breaks the git precommit hook.
Every other git command updates the index to make the
commit-about-to-be-made before running the precommit hook, and indeed
the 'pre-commit.sample' distributed with git assumes that the index
reflects the commit. However, in the case of "git commit <filename>"
the man page states "the commit will ignore changes staged in the
index, and instead record the current content of the listed files
(which must already be known to git)".
This seems like a bug. The precommit hook does not know (and has no
apparent way of knowing) the contents of the commit-in-progress! If
there is a workaround, it should be incorporated into the
'pre-commit.sample', which otherwise displays the same bug; to wit,
you can inadvertently commit changes which would fail the pre-commit
check by simply using the 'git commit <filename>' form.
Worse/alternatively, bad files already existing in the index can block
the commit of "good" files named on the command line.
The fix appears clear: "git commit <filename>..." should do the
equivalent of stashing the current index, adding the named files,
*then* run the precommit hook, then do the commit, before restoring
the stashed index. That would provide a consistent state for the
precommit hook.
--scott
next reply other threads:[~2011-04-12 15:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 15:17 C. Scott Ananian [this message]
2011-04-12 21:04 ` precommit hook broken with "git commit <filename>" Junio C Hamano
2011-04-12 23:09 ` C. Scott Ananian
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTimB=TZ1gP-18ywbZUOZSbDamkRwCg@mail.gmail.com' \
--to=cscott@laptop.org \
--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.
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 NNTP newsgroup(s).