From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Dec 2011 19:42:45 +0000 (-0800)
Subject: Merge branch 'jl/submodule-status-failure-report' into maint
X-Git-Tag: v1.7.8.1~1
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/b43ba7891422127eb3ec7bd88c9a8ea102b19d0c?hp=f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517

Merge branch 'jl/submodule-status-failure-report' into maint

* jl/submodule-status-failure-report:
diff/status: print submodule path when looking for changes fails
---

diff --git a/submodule.c b/submodule.c
index 52cdcc6a63..68c1ba90b9 100644
--- a/submodule.c
+++ b/submodule.c
@@ -689,7 +689,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	cp.out = -1;
 	cp.dir = path;
 	if (start_command(&cp))
-		die("Could not run git status --porcelain");
+		die("Could not run 'git status --porcelain' in submodule %s", path);
 
 	len = strbuf_read(&buf, cp.out, 1024);
 	line = buf.buf;
@@ -714,7 +714,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	close(cp.out);
 
 	if (finish_command(&cp))
-		die("git status --porcelain failed");
+		die("'git status --porcelain' failed in submodule %s", path);
 
 	strbuf_release(&buf);
 	return dirty_submodule;