diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2018-05-24 20:47:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-25 06:25:42 (GMT) |
| commit | 4d36f88be7401fb4ff225557aae05a458091b24b (patch) | |
| tree | e5f6ac6d2d65b07a78653fb9f0bcb12974f3940d /submodule.c | |
| parent | 468165c1d8a442994a825f3684528361727cd8c0 (diff) | |
| download | git-4d36f88be7401fb4ff225557aae05a458091b24b.zip git-4d36f88be7401fb4ff225557aae05a458091b24b.tar.gz git-4d36f88be7401fb4ff225557aae05a458091b24b.tar.bz2 | |
submodule: do not pass null OID to setup_revisions
If "git pull --recurse-submodules --rebase" is invoked when the current
branch and its corresponding remote-tracking branch have no merge base,
a "bad object" fatal error occurs. This issue was introduced with commit
a6d7eb2c7a ("pull: optionally rebase submodules (remote submodule
changes only)", 2017-06-23), which also introduced this feature.
This is because cmd_pull() in builtin/pull.c thus invokes
submodule_touches_in_range() with a null OID as the first parameter.
Ensure that this case works, and document what happens in this case.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 12a2503..db8bd4a 100644 --- a/submodule.c +++ b/submodule.c @@ -1166,8 +1166,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; |