summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-10 18:10:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-10 19:36:06 (GMT)
commit9619617d33c83ad873539384b3cbfd564053be76 (patch)
treec68993d523b60c297c80770dafe2a820a8fbaf6b /sha1_name.c
parent7c5f3cc4a5680e23b8aa378ed9b655a1779ee881 (diff)
downloadgit-9619617d33c83ad873539384b3cbfd564053be76.zip
git-9619617d33c83ad873539384b3cbfd564053be76.tar.gz
git-9619617d33c83ad873539384b3cbfd564053be76.tar.bz2
fix overstrict :<path> diagnosis
Given "git log :", we get a disambiguation message that tries to be helpful and yet totally misses the point, i.e. $ git log : fatal: Path '' does not exist (neither on disk nor in the index). $ git log :/ fatal: Path '/' exists on disk, but not in the index. An empty path nor anything that begins with '/' cannot possibly in the index, and it is wrong to guess that the user might have meant to access such an index entry. It should yield the same error message as "git log '*.c'", i.e. $ git log '*.c' fatal: ambiguous argument '*.c': unknown revision or path not in the working tree. Use '--' to separate paths from revisions Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index faea58d..90d8bfa 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1173,7 +1173,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
}
pos++;
}
- if (!gently)
+ if (!gently && name[1] && name[1] != '/')
diagnose_invalid_index_path(stage, prefix, cp);
free(new_path);
return -1;