diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-14 07:00:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-14 07:00:52 (GMT) |
| commit | 91c23f76cec4a4ec9b9143b7ebb31e639856ed16 (patch) | |
| tree | bfa69694a4d80b1a17a8af0b917f3a9df272ebe5 /submodule.c | |
| parent | 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6 (diff) | |
| parent | 6a5cedac87ff4f1d8d8b535dac8184e1f7fbc454 (diff) | |
| download | git-91c23f76cec4a4ec9b9143b7ebb31e639856ed16.zip git-91c23f76cec4a4ec9b9143b7ebb31e639856ed16.tar.gz git-91c23f76cec4a4ec9b9143b7ebb31e639856ed16.tar.bz2 | |
Merge branch 'jl/submodule-status-failure-report'
* jl/submodule-status-failure-report:
diff/status: print submodule path when looking for changes fails
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index 52cdcc6..68c1ba9 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; |