From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:13 +0000 (+0900)
Subject: Merge branch 'nd/commit-a-with-paths-msg-update'
X-Git-Tag: v2.22.0-rc0~69
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/e313c768e0daf78da2d9e23967dc6625e9db0837?hp=776f3e1fb73a6440804aa3dde4ffd3b6bdf60a19

Merge branch 'nd/commit-a-with-paths-msg-update'

The message given when "git commit -a <paths>" errors out has been
updated.

* nd/commit-a-with-paths-msg-update:
commit: improve error message in "-a <paths>" case
---

diff --git a/builtin/commit.c b/builtin/commit.c
index a138ff85b0..833ecb316a 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1194,7 +1194,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	handle_untracked_files_arg(s);
 
 	if (all && argc > 0)
-		die(_("Paths with -a does not make sense."));
+		die(_("paths '%s ...' with -a does not make sense"),
+		    argv[0]);
 
 	if (status_format != STATUS_FORMAT_NONE)
 		dry_run = 1;