1. Stefan Saasen
  2. git


Junio C Hamano  committed abd3fd3 Merge

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

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

  • Participants
  • Parent commits b2a6095, f197ed2
  • Branches master

Comments (0)

Files changed (1)

File builtin/commit.c

View file
  • Ignore whitespace
 "    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;
 	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;