undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'es/outside-repo-errmsg-hints'

Browse Source 
Error message clarification.

* es/outside-repo-errmsg-hints:
  prefix_path: show gitdir when arg is outside repo
This commit is contained in:
Junio C Hamano 2020-02-17 13:22:19 -08:00
commit f97741f6e9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pathspec.c
View File

@ -439,7 +439,8 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
match = prefix_path_gently(prefix, prefixlen, match = prefix_path_gently(prefix, prefixlen,
&prefixlen, copyfrom); &prefixlen, copyfrom);
if (!match) if (!match)
die(_("%s: '%s' is outside repository"), elt, copyfrom); die(_("%s: '%s' is outside repository at '%s'"), elt,
copyfrom, absolute_path(get_git_work_tree()));
} }
item->match = match; item->match = match;

3
setup.c
View File

@ -121,7 +121,8 @@ char *prefix_path(const char *prefix, int len, const char *path)
{ {
char *r = prefix_path_gently(prefix, len, NULL, path); char *r = prefix_path_gently(prefix, len, NULL, path);
if (!r) if (!r)
die(_("'%s' is outside repository"), path); die(_("'%s' is outside repository at '%s'"), path,
absolute_path(get_git_work_tree()));
return r; return r;
} }