prefix_path: show gitdir when arg is outside repo

nasamuffin · gitster · commit e0020b2f8291 · 2020-02-16T15:32:59.000-08:00
When developing a script, it can be painful to understand why Git thinks
something is outside the current repo, if the current repo isn't what
the user thinks it is. Since this can be tricky to diagnose, especially
in cases like submodules or nested worktrees, let's give the user a hint
about which repository is offended about that path.

Signed-off-by: Emily Shaffer &lt;emilyshaffer@google.com&gt;
Acked-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/pathspec.c b/pathspec.c
@@ -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;
diff --git a/setup.c b/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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,8 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,`
`439`	`439`	`match = prefix_path_gently(prefix, prefixlen,`
`440`	`440`	`&prefixlen, copyfrom);`
`441`	`441`	`if (!match)`
`442`		`- die(_("%s: '%s' is outside repository"), elt, copyfrom);`
	`442`	`+ die(_("%s: '%s' is outside repository at '%s'"), elt,`
	`443`	`+ copyfrom, absolute_path(get_git_work_tree()));`
`443`	`444`	`}`
`444`	`445`
`445`	`446`	`item->match = match;`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,8 @@ char prefix_path(const char prefix, int len, const char *path)`
`121`	`121`	`{`
`122`	`122`	`char *r = prefix_path_gently(prefix, len, NULL, path);`
`123`	`123`	`if (!r)`
`124`		`- die(_("'%s' is outside repository"), path);`
	`124`	`+ die(_("'%s' is outside repository at '%s'"), path,`
	`125`	`+ absolute_path(get_git_work_tree()));`
`125`	`126`	`return r;`
`126`	`127`	`}`
`127`	`128`