diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:56 +0900 |
| commit | 103251a318ed960c9574e68ad21d013fca78560b (patch) | |
| tree | cb664e4a5ff26e4de16646ef1975ce11daca1dfe /builtin | |
| parent | Merge branch 'nd/combined-test-helper' (diff) | |
| parent | submodule: check for NULL return of get_submodule_ref_store() (diff) | |
| download | tgif-103251a318ed960c9574e68ad21d013fca78560b.tar.xz | |
Merge branch 'rs/status-with-removed-submodule'
"git submodule status" misbehaved on a submodule that has been
removed from the working tree.
* rs/status-with-removed-submodule:
submodule: check for NULL return of get_submodule_ref_store()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index a2327c98b0..a404df3ea4 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -655,9 +655,13 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, displaypath); } else if (!(flags & OPT_CACHED)) { struct object_id oid; + struct ref_store *refs = get_submodule_ref_store(path); - if (refs_head_ref(get_submodule_ref_store(path), - handle_submodule_head_ref, &oid)) + if (!refs) { + print_status(flags, '-', path, ce_oid, displaypath); + goto cleanup; + } + if (refs_head_ref(refs, handle_submodule_head_ref, &oid)) die(_("could not resolve HEAD ref inside the " "submodule '%s'"), path); |