[PATCH] setup: clarify error messages for file/revisions ambiguity
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Aug 3, 2012, 08:21 UTC
- Message-ID
- <1343982080-15054-1-git-send-email-Matthieu.Moy@imag.fr>
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> --- setup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/setup.c b/setup.c index 9139bee..3a1b2fd 100644 --- a/setup.c +++ b/setup.c @@ -79,7 +79,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 '-- <path>...' to specify paths that do not exist locally.", + "Use 'git <command> -- <path>...' to specify paths that do not exist locally.", arg); /* * Saying "'(icase)foo' does not exist in the index" when the @@ -92,7 +92,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 <command> [<revision>...] -- [<file>...]'", arg); } @@ -141,7 +142,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 <command> [<revision>...] -- [<file>...]'", arg); } /*
-- 1.7.12.rc0.32.g9fb4847.dirty