Browse Source

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

* jl/submodule-status-failure-report:
  diff/status: print submodule path when looking for changes fails
maint
Junio C Hamano 13 years ago
parent
commit
b43ba78914
  1. 4
      submodule.c

4
submodule.c

@ -689,7 +689,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) @@ -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) @@ -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;

Loading…
Cancel
Save