diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-04 12:39:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-04 12:39:48 (GMT) |
| commit | f635b8d17b673ffb96c0f10d11751500e1892b2a (patch) | |
| tree | 41d2a0f42dfa5a060d96a12194efc49ced331633 /submodule.c | |
| parent | c2c7d17b030646b40e6764ba34a5ebf66aee77af (diff) | |
| parent | 4d36f88be7401fb4ff225557aae05a458091b24b (diff) | |
| download | git-f635b8d17b673ffb96c0f10d11751500e1892b2a.zip git-f635b8d17b673ffb96c0f10d11751500e1892b2a.tar.gz git-f635b8d17b673ffb96c0f10d11751500e1892b2a.tar.bz2 | |
Merge branch 'jt/submodule-pull-recurse-rebase'
"git pull -recurse-submodules --rebase", when the submodule
repository's history did not have anything common between ours and
the upstream's, failed to execute. We need to fetch from them to
continue even in such a case.
* jt/submodule-pull-recurse-rebase:
submodule: do not pass null OID to setup_revisions
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index edc3a20..939d687 100644 --- a/submodule.c +++ b/submodule.c @@ -1169,8 +1169,10 @@ int submodule_touches_in_range(struct object_id *excl_oid, argv_array_push(&args, "--"); /* args[0] program name */ argv_array_push(&args, oid_to_hex(incl_oid)); - argv_array_push(&args, "--not"); - argv_array_push(&args, oid_to_hex(excl_oid)); + if (!is_null_oid(excl_oid)) { + argv_array_push(&args, "--not"); + argv_array_push(&args, oid_to_hex(excl_oid)); + } collect_changed_submodules(&subs, &args); ret = subs.nr; |