diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:40 -0700 |
| commit | 385185403e74f3b4b52c33bb263ca735c512f66f (patch) | |
| tree | 2ac5db9ea31909c9d633feaf1b74dc3f89a16a97 /sha1_name.c | |
| parent | Automatically autoload bashcompinit for ZSH, when needed (diff) | |
| parent | sha1_name: Suggest commit:./file for path in subdir (diff) | |
| download | tgif-385185403e74f3b4b52c33bb263ca735c512f66f.tar.xz | |
Merge branch 'mg/sha1-path-advise'
* mg/sha1-path-advise:
sha1_name: Suggest commit:./file for path in subdir
t1506: factor out test for "Did you mean..."
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sha1_name.c b/sha1_name.c index faea58dc8c..69cd6c815d 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1012,11 +1012,13 @@ static void diagnose_invalid_sha1_path(const char *prefix, if (!get_tree_entry(tree_sha1, fullname, sha1, &mode)) { die("Path '%s' exists, but not '%s'.\n" - "Did you mean '%s:%s'?", + "Did you mean '%s:%s' aka '%s:./%s'?", fullname, filename, object_name, - fullname); + fullname, + object_name, + filename); } die("Path '%s' does not exist in '%s'", filename, object_name); @@ -1065,9 +1067,10 @@ static void diagnose_invalid_index_path(int stage, if (ce_namelen(ce) == fullnamelen && !memcmp(ce->name, fullname, fullnamelen)) die("Path '%s' is in the index, but not '%s'.\n" - "Did you mean ':%d:%s'?", + "Did you mean ':%d:%s' aka ':%d:./%s'?", fullname, filename, - ce_stage(ce), fullname); + ce_stage(ce), fullname, + ce_stage(ce), filename); } if (!lstat(filename, &st)) |