Merge branch 'es/outside-repo-errmsg-hints'
Error message clarification.
* es/outside-repo-errmsg-hints:
prefix_path: show gitdir when arg is outside repo
diff --git a/pathspec.c b/pathspec.c
index 128f27f..166d255 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -439,7 +439,8 @@
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;
diff --git a/setup.c b/setup.c
index 12228c0..4ea7a0b 100644
--- a/setup.c
+++ b/setup.c
@@ -121,7 +121,8 @@
{
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;
}