From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:49 +0000 (-0700)
Subject: Merge branch 'jk/maint-advice-empty-amend'
X-Git-Tag: v1.7.2-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/542ed78232ecbb1099eee5e3a4f1add0a2faa8d3?hp=d5cff17edaf438bbf45a2130e9cadc0c938291d6

Merge branch 'jk/maint-advice-empty-amend'

* jk/maint-advice-empty-amend:
commit: give advice on empty amend
---

diff --git a/builtin/commit.c b/builtin/commit.c
index 511d4901d5..5e4f0f33b7 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;
@@ -708,6 +713,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;
 	}