summaryrefslogtreecommitdiffstats
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2024-02-23 09:34:20 +0100
committerJunio C Hamano <gitster@pobox.com>2024-02-23 19:19:39 +0100
commitd4bf19308b81653cfb0d7b54489010dc1e0113b0 (patch)
tree83fade25eca331c2ac36678dfb49b37af07cdc89 /git-compat-util.h
parentmerge-tree: accept 3 trees as arguments (diff)
downloadgit-d4bf19308b81653cfb0d7b54489010dc1e0113b0.tar.xz
git-d4bf19308b81653cfb0d7b54489010dc1e0113b0.zip
merge-tree: fail with a non-zero exit code on missing tree objects
When `git merge-tree` encounters a missing tree object, it should error out and not continue quietly as if nothing had happened. However, as of time of writing, `git merge-tree` _does_ continue, and then offers the empty tree as result. Let's fix this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
0 files changed, 0 insertions, 0 deletions