From 5a1dbd48bcd1b917ce103e4f5bb68d3cfadf9543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Wed, 20 Mar 2019 17:29:06 +0700 Subject: [PATCH] commit: improve error message in "-a " case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I did something stupid today and got $ git commit -a --fixup= @^ fatal: Paths with -a does not make sense. which didn't make any sense (at least for the first few seconds). Include the first path(spec) in the error message to help spot the problem quicker. Now it shows fatal: paths '@^ ...' with -a does not make sense which should ring some bell because @^ should clearly not be considered a path. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 2986553d5f..48ddccaa37 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1185,7 +1185,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;