From: Matthieu Moy Date: Fri, 3 Aug 2012 08:21:20 +0000 (+0200) Subject: setup: clarify error messages for file/revisions ambiguity X-Git-Tag: v1.7.11.6~22^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d4b573977833f887635be386b84681e73834b72;p=git.git setup: clarify error messages for file/revisions ambiguity The previous "Use '--' to separate filenames from revisions" may sound obvious for an old-time Unix user, but does not make it clear how to use this '--'. In addition to mentionning this '--', give an idea of what the new command should look like. Ideally, we could provide cut-and-paste ready commands based on the command that just failed, but we have no easy access to argv[] in this place of the code. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/setup.c b/setup.c index e11497720..7663a4cbb 100644 --- a/setup.c +++ b/setup.c @@ -82,7 +82,7 @@ static void NORETURN die_verify_filename(const char *prefix, if (!diagnose_misspelt_rev) die("%s: no such path in the working tree.\n" - "Use '-- ...' to specify paths that do not exist locally.", + "Use 'git -- ...' to specify paths that do not exist locally.", arg); /* * Saying "'(icase)foo' does not exist in the index" when the @@ -96,7 +96,8 @@ static void NORETURN die_verify_filename(const char *prefix, /* ... or fall back the most general message. */ die("ambiguous argument '%s': unknown revision or path not in the working tree.\n" - "Use '--' to separate paths from revisions", arg); + "Use '--' to separate paths from revisions, like this:\n" + "'git [...] -- [...]'", arg); } @@ -145,7 +146,8 @@ void verify_non_filename(const char *prefix, const char *arg) if (!check_filename(prefix, arg)) return; die("ambiguous argument '%s': both revision and filename\n" - "Use '--' to separate filenames from revisions", arg); + "Use '--' to separate paths from revisions, like this:\n" + "'git [...] -- [...]'", arg); } /*