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 <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Aug 3, 2012 at 10:21 UTC
4d4b573977833f887635be386b84681e73834b72
1 file changed
+5
-3
setup.c
+5
-3
@@ -82,7 +82,7 @@ static void NORETURN die_verify_filename(const char *prefix,
82
83
if (!diagnose_misspelt_rev)
84
die("%s: no such path in the working tree.\n"
85
- "Use '-- <path>...' to specify paths that do not exist locally.",
85
+ "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
86
arg);
87
/*
88
* Saying "'(icase)foo' does not exist in the index" when the
@@ -96,7 +96,8 @@ static void NORETURN die_verify_filename(const char *prefix,
96
97
/* ... or fall back the most general message. */
98
die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
99
- "Use '--' to separate paths from revisions", arg);
99
+ "Use '--' to separate paths from revisions, like this:\n"
100
+ "'git <command> [<revision>...] -- [<file>...]'", arg);
101
102
}
103
@@ -145,7 +146,8 @@ void verify_non_filename(const char *prefix, const char *arg)
146
if (!check_filename(prefix, arg))
147
return;
148
die("ambiguous argument '%s': both revision and filename\n"
148
- "Use '--' to separate filenames from revisions", arg);
149
+ "Use '--' to separate paths from revisions, like this:\n"
150
+ "'git <command> [<revision>...] -- [<file>...]'", arg);
151
}
152
153
/*