diff options
| author | Jeff King <peff@peff.net> | 2010-06-06 20:41:46 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-11 08:55:57 -0700 |
| commit | f197ed2fbeb2868c3514ad35bf986a3aa60285f0 (patch) | |
| tree | de39fff1a675df503380579b4a178dc0003a63d5 | |
| parent | 2543d9b609d158f611e317738644e67cacac6b9a (diff) | |
| download | git-f197ed2fbeb2868c3514ad35bf986a3aa60285f0.tar.gz git-f197ed2fbeb2868c3514ad35bf986a3aa60285f0.tar.xz | |
commit: give advice on empty amend
We generally disallow empty commits with "git commit". The
output produced by the wt_status functions is generally
sufficient to explain what happened.
With --amend commits, however, things are a little more
confusing. We would create an empty commit not if you
actually have staged changes _now_, but if your staged
changes match HEAD^. In this case, it is not immediately
obvious why "git commit" claims no changes, but "git status"
does not. Furthermore, we should point the user in the
direction of git reset, which would eliminate the empty
commit entirely.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/commit.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c5ab683d5..216ecc91d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -48,6 +48,11 @@ static const char implicit_ident_advice[] = "\n" " git commit --amend --author='Your Name <you@example.com>'\n"; +static const char empty_amend_advice[] = +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n"; + static unsigned char head_sha1[20]; static char *use_message_buffer; @@ -693,6 +698,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (!commitable && !in_merge && !allow_empty && !(amend && is_a_merge(head_sha1))) { run_status(stdout, index_file, prefix, 0, s); + if (amend) + fputs(empty_amend_advice, stderr); return 0; } |