Skip to content

Commit b43ba78

Browse files
committed
Merge branch 'jl/submodule-status-failure-report' into maint
* jl/submodule-status-failure-report: diff/status: print submodule path when looking for changes fails
2 parents f0b4fd4 + 6a5ceda commit b43ba78

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

submodule.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
689689
cp.out = -1;
690690
cp.dir = path;
691691
if (start_command(&cp))
692-
die("Could not run git status --porcelain");
692+
die("Could not run 'git status --porcelain' in submodule %s", path);
693693

694694
len = strbuf_read(&buf, cp.out, 1024);
695695
line = buf.buf;
@@ -714,7 +714,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
714714
close(cp.out);
715715

716716
if (finish_command(&cp))
717-
die("git status --porcelain failed");
717+
die("'git status --porcelain' failed in submodule %s", path);
718718

719719
strbuf_release(&buf);
720720
return dirty_submodule;

0 commit comments

Comments
 (0)