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

* jl/submodule-status-failure-report: diff/status: print submodule path when looking for changes fails
git-mirror · Dec 21, 2011 · b43ba78 · b43ba78
2 parents f0b4fd4 + 6a5ceda
commit b43ba78
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;