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.h | |
| 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.h')
| -rw-r--r-- | submodule.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index a2871d0..7856b8a 100644 --- a/submodule.h +++ b/submodule.h @@ -92,7 +92,10 @@ extern int bad_to_remove_submodule(const char *path, unsigned flags); int add_submodule_odb(const char *path); -/* 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, |