diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
| commit | b43ba7891422127eb3ec7bd88c9a8ea102b19d0c (patch) | |
| tree | 754ddb2158252c6dccf0310d9dde344acf10b3d9 /submodule.c | |
| parent | f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517 (diff) | |
| parent | 6a5cedac87ff4f1d8d8b535dac8184e1f7fbc454 (diff) | |
| download | git-b43ba7891422127eb3ec7bd88c9a8ea102b19d0c.tar.gz git-b43ba7891422127eb3ec7bd88c9a8ea102b19d0c.tar.xz | |
Merge branch 'jl/submodule-status-failure-report' into maint
* 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 52cdcc6a6..68c1ba90b 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; |