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>
Johannes Schindelin committed
Feb 23, 2024 at 08:34 UTC
d4bf19308b81653cfb0d7b54489010dc1e0113b0
2 files changed
+15
-3
merge-ort.c
+4
-3
@@ -1659,9 +1659,10 @@ static int collect_merge_info(struct merge_options *opt,
1659
info.data = opt;
1660
info.show_all_errors = 1;
1661
1662
- parse_tree(merge_base);
1663
- parse_tree(side1);
1664
- parse_tree(side2);
1662
+ if (parse_tree(merge_base) < 0 ||
1663
+ parse_tree(side1) < 0 ||
1664
+ parse_tree(side2) < 0)
1665
+ return -1;
1666
init_tree_desc(t + 0, merge_base->buffer, merge_base->size);
1667
init_tree_desc(t + 1, side1->buffer, side1->size);
1668
init_tree_desc(t + 2, side2->buffer, side2->size);
t/t4301-merge-tree-write-tree.sh
+11
@@ -951,4 +951,15 @@ test_expect_success '--merge-base with tree OIDs' '
951
test_cmp with-commits with-trees
952
'
953
954
+test_expect_success 'error out on missing tree objects' '
955
+ git init --bare missing-tree.git &&
956
+ git rev-list side3 >list &&
957
+ git rev-parse side3^: >>list &&
958
+ git pack-objects missing-tree.git/objects/pack/side3-tree-is-missing <list &&
959
+ side3=$(git rev-parse side3) &&
960
+ test_must_fail git --git-dir=missing-tree.git merge-tree $side3^ $side3 >actual 2>err &&
961
+ test_grep "Could not read $(git rev-parse $side3:)" err &&
962
+ test_must_be_empty actual
963
+'
964
+
965
test_done