summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 23:00:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 23:00:52 -0800
commit91c23f76cec4a4ec9b9143b7ebb31e639856ed16 (patch)
treebfa69694a4d80b1a17a8af0b917f3a9df272ebe5
parentMerge branch 'tr/userdiff-c-returns-pointer' (diff)
parentdiff/status: print submodule path when looking for changes fails (diff)
downloadtgif-91c23f76cec4a4ec9b9143b7ebb31e639856ed16.tar.xz
Merge branch 'jl/submodule-status-failure-report'
* jl/submodule-status-failure-report: diff/status: print submodule path when looking for changes fails
-rw-r--r--submodule.c4
1 files changed, 2 insertions, 2 deletions
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;