From: Junio C Hamano <gitster@pobox•com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Cc: Ivo Anjo <ivo.anjo@ist•utl.pt>, git@vger•kernel.org
Subject: Re: How to prevent empty git commit --amend
Date: Wed, 14 Jan 2015 09:36:25 -0800 [thread overview]
Message-ID: <xmqq387db6xy.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqfvbdb7dc.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 14 Jan 2015 09:27:11 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp•fr> writes:
>
>> Ivo Anjo <ivo.anjo@ist•utl.pt> writes:
>>
>>> Is there a way to prevent a *git commit --amend** with nothing to
>>> commit from working?
>>> If not, I would like to suggest that this feature would be very helpful :)
>>
>> I don't know any way to let Git do the check for you, but
>>
>> git diff --staged --quiet || git commit --amend
>>
>> should do it. You can alias it like
>>
>> [alias]
>> amend = !git diff --staged --quiet || git commit --amend
>>
>> and then use "git amend".
>
> That would not let you say "git amend Makefile", no?
>
> !sh -c 'git diff --cached --quiet "$@" || git commit --amend "$@"' -
>
> or something, perhaps?
Heh, not that but something like that ;-).
* If we have pathspec, we would want to see if the HEAD and the
working tree differ at the given paths;
* Otherwise we would want to see if the HEAD and the index differ.
So it would be more like this, I guess.
case "$#" in
0) git diff --quiet --cached ;;
*) git diff --quiet HEAD -- "$@" ;;
esac || git commit --amend ${1+--} "$@"
next prev parent reply other threads:[~2015-01-14 17:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 8:56 How to prevent empty git commit --amend Ivo Anjo
2015-01-13 8:59 ` Daniel Knittl-Frank
2015-01-13 10:22 ` Ivo Anjo
2015-01-13 11:20 ` Michael J Gruber
2015-01-14 10:00 ` Matthieu Moy
2015-01-14 12:15 ` Ivo Anjo
2015-01-14 12:45 ` Matthieu Moy
2015-01-14 17:27 ` Junio C Hamano
2015-01-14 17:36 ` Junio C Hamano [this message]
2015-01-15 16:08 ` [RFC/PATCH] commit/status: show the index-worktree with -v -v Michael J Gruber
2015-01-15 20:11 ` Junio C Hamano
2015-01-15 20:38 ` Junio C Hamano
2015-01-16 8:13 ` Michael J Gruber
2015-03-03 14:16 ` [PATCHv2 0/2] More diffs for commit/status Michael J Gruber
2015-03-03 14:16 ` [PATCHv2 1/2] t7508: test git status -v Michael J Gruber
2015-03-03 21:20 ` Junio C Hamano
2015-03-03 22:26 ` Junio C Hamano
2015-03-04 11:05 ` Michael J Gruber
2015-03-04 21:27 ` Junio C Hamano
2015-03-03 14:16 ` [PATCHv2 2/2] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-03 21:26 ` Junio C Hamano
2015-03-04 11:11 ` Michael J Gruber
2015-03-04 21:13 ` Junio C Hamano
2015-03-05 14:13 ` [PATCHv3 0/3]More diffs for commit/status Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 1/3] t7508: .gitignore 'expect' and 'output' files Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 2/3] t7508: test git status -v Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 3/3] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-05 19:25 ` [PATCHv3 0/3]More diffs for commit/status Junio C Hamano
2015-03-05 20:15 ` Junio C Hamano
2015-03-05 20:27 ` Junio C Hamano
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=xmqq387db6xy.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=ivo.anjo@ist$(echo .)utl.pt \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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