]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-am.txt
Merge branch 'js/merge-base-with-missing-commit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Mar 2024 21:12:30 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Mar 2024 21:12:30 +0000 (14:12 -0700)
commit7745f92507517c4e60dc2a7faad40eee49ee670b
treef9eb30d1767f40a69db6b874f50bbdc8953d745d
parente09f1254c54329773904fe25d7c545a1fb4fa920
parent25fd20eb44cfcbb0652595de2144f0e077a957ec
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
12 files changed:
builtin/fetch.c
builtin/merge-tree.c
builtin/merge.c
builtin/rebase.c
merge-ort.c
merge-recursive.c
object-name.c
remote.c
revision.c
sequencer.c
submodule.c
t/t4301-merge-tree-write-tree.sh