diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:31:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:31:48 -0700 |
| commit | abd3fd358b73c3a09eb0e70ebe91cd8807c9777d (patch) | |
| tree | 4b50adcfe346d4d7e1743db423c4c2b17b9c55d6 /builtin | |
| parent | b2a60953085651fe892ee20508fe2f561f0bba8f (diff) | |
| parent | f197ed2fbeb2868c3514ad35bf986a3aa60285f0 (diff) | |
| download | git-abd3fd358b73c3a09eb0e70ebe91cd8807c9777d.tar.gz git-abd3fd358b73c3a09eb0e70ebe91cd8807c9777d.tar.xz | |
Merge branch 'jk/maint-advice-empty-amend' into maint
* jk/maint-advice-empty-amend:
commit: give advice on empty amend
Diffstat (limited to 'builtin')
| -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 b71d8f62d..9d59af034 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; @@ -699,6 +704,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; } |