Merge branch 'es/outside-repo-errmsg-hints'
Error message clarification. * es/outside-repo-errmsg-hints: prefix_path: show gitdir when arg is outside repo
This commit is contained in:
commit
f97741f6e9
@ -439,7 +439,8 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
|
||||
match = prefix_path_gently(prefix, prefixlen,
|
||||
&prefixlen, copyfrom);
|
||||
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;
|
||||
|
3
setup.c
3
setup.c
@ -121,7 +121,8 @@ char *prefix_path(const char *prefix, int len, const char *path)
|
||||
{
|
||||
char *r = prefix_path_gently(prefix, len, NULL, path);
|
||||
if (!r)
|
||||
die(_("'%s' is outside repository"), path);
|
||||
die(_("'%s' is outside repository at '%s'"), path,
|
||||
absolute_path(get_git_work_tree()));
|
||||
return r;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user