Browse Source

rev/path disambiguation: further restrict "misspelled index entry" diag

A colon followed by anything !isalnum() (e.g. ":/heh") at this point is
known not to be an existing rev.  Just give a generic "neither a rev nor
a path" error message.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 14 years ago
parent
commit
0e539dca51
  1. 13
      setup.c

13
setup.c

@ -85,8 +85,17 @@ static void NORETURN die_verify_filename(const char *prefix, const char *arg) @@ -85,8 +85,17 @@ static void NORETURN die_verify_filename(const char *prefix, const char *arg)
{
unsigned char sha1[20];
unsigned mode;
/* try a detailed diagnostic ... */
get_sha1_with_mode_1(arg, sha1, &mode, 1, prefix);

/*
* Saying "'(icase)foo' does not exist in the index" when the
* user gave us ":(icase)foo" is just stupid. A magic pathspec
* begins with a colon and is followed by a non-alnum; do not
* let get_sha1_with_mode_1(only_to_die=1) to even trigger.
*/
if (!(arg[0] == ':' && !isalnum(arg[1])))
/* try a detailed diagnostic ... */
get_sha1_with_mode_1(arg, sha1, &mode, 1, 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);

Loading…
Cancel
Save