|
|
|
@ -164,7 +164,8 @@ int check_filename(const char *prefix, const char *arg)
@@ -164,7 +164,8 @@ int check_filename(const char *prefix, const char *arg)
|
|
|
|
|
die_errno(_("failed to stat '%s'"), arg); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void NORETURN die_verify_filename(const char *prefix, |
|
|
|
|
static void NORETURN die_verify_filename(struct repository *r, |
|
|
|
|
const char *prefix, |
|
|
|
|
const char *arg, |
|
|
|
|
int diagnose_misspelt_rev) |
|
|
|
|
{ |
|
|
|
@ -179,7 +180,7 @@ static void NORETURN die_verify_filename(const char *prefix,
@@ -179,7 +180,7 @@ static void NORETURN die_verify_filename(const char *prefix,
|
|
|
|
|
* let maybe_die_on_misspelt_object_name() even trigger. |
|
|
|
|
*/ |
|
|
|
|
if (!(arg[0] == ':' && !isalnum(arg[1]))) |
|
|
|
|
maybe_die_on_misspelt_object_name(arg, prefix); |
|
|
|
|
maybe_die_on_misspelt_object_name(r, arg, prefix); |
|
|
|
|
|
|
|
|
|
/* ... or fall back the most general message. */ |
|
|
|
|
die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n" |
|
|
|
@ -234,7 +235,7 @@ void verify_filename(const char *prefix,
@@ -234,7 +235,7 @@ void verify_filename(const char *prefix,
|
|
|
|
|
die(_("option '%s' must come before non-option arguments"), arg); |
|
|
|
|
if (looks_like_pathspec(arg) || check_filename(prefix, arg)) |
|
|
|
|
return; |
|
|
|
|
die_verify_filename(prefix, arg, diagnose_misspelt_rev); |
|
|
|
|
die_verify_filename(the_repository, prefix, arg, diagnose_misspelt_rev); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|