| commit | d4bf19308b81653cfb0d7b54489010dc1e0113b0 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 23 Feb 2024 08:34:20 +0000 (23 08:34 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Feb 2024 18:19:39 +0000 (23 10:19 -0800) | ||
| tree | 83fade25eca331c2ac36678dfb49b37af07cdc89 | treesnapshot (tar.gz zip) |
| parent | 5f43cf5b2e4b68386d3774bce880b0f74d801635 | commitdiff |
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>
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>
| merge-ort.c | diffblobblamehistory | |
| t/t4301-merge-tree-write-tree.sh | diffblobblamehistory |