From 4d36f88be7401fb4ff225557aae05a458091b24b Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Thu, 24 May 2018 13:47:29 -0700 Subject: 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 Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'submodule.h') diff --git a/submodule.h b/submodule.h index 9589f1312..0189b3ebd 100644 --- a/submodule.h +++ b/submodule.h @@ -94,7 +94,10 @@ extern int merge_submodule(struct object_id *result, const char *path, const struct object_id *a, const struct object_id *b, int search); -/* Checks if there are submodule changes in a..b. */ +/* + * Checks if there are submodule changes in a..b. If a is the null OID, + * checks b and all its ancestors instead. + */ extern int submodule_touches_in_range(struct object_id *a, struct object_id *b); extern int find_unpushed_submodules(struct oid_array *commits, -- cgit v1.2.3