diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-03-11 14:12:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-11 14:12:30 -0700 |
commit | 7745f92507517c4e60dc2a7faad40eee49ee670b (patch) | |
tree | f9eb30d1767f40a69db6b874f50bbdc8953d745d /remote.c | |
parent | e09f1254c54329773904fe25d7c545a1fb4fa920 (diff) | |
parent | 25fd20eb44cfcbb0652595de2144f0e077a957ec (diff) | |
download | git-7745f92507517c4e60dc2a7faad40eee49ee670b.tar.gz |
Merge branch 'js/merge-base-with-missing-commit'
Make sure failure return from merge_bases_many() is properly caught.
* js/merge-base-with-missing-commit:
merge-ort/merge-recursive: do report errors in `merge_submodule()`
merge-recursive: prepare for `merge_submodule()` to report errors
commit-reach(repo_get_merge_bases_many_dirty): pass on errors
commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors
commit-reach(get_octopus_merge_bases): pass on "missing commits" errors
commit-reach(repo_get_merge_bases): pass on "missing commits" errors
commit-reach(get_merge_bases_many_0): pass on "missing commits" errors
commit-reach(merge_bases_many): pass on "missing commits" errors
commit-reach(paint_down_to_common): start reporting errors
commit-reach(paint_down_to_common): prepare for handling shallow commits
commit-reach(repo_in_merge_bases_many): report missing commits
commit-reach(repo_in_merge_bases_many): optionally expect missing commits
commit-reach(paint_down_to_common): plug two memory leaks
Diffstat (limited to 'remote.c')
-rw-r--r-- | remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2679,7 +2679,7 @@ static int is_reachable_in_reflog(const char *local, const struct ref *remote) if (MERGE_BASES_BATCH_SIZE < size) size = MERGE_BASES_BATCH_SIZE; - if ((ret = repo_in_merge_bases_many(the_repository, commit, size, chunk))) + if ((ret = repo_in_merge_bases_many(the_repository, commit, size, chunk, 0))) break; } |