diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
| commit | ae46d5fb98b316767f51a82fc0c1441174995a34 (patch) | |
| tree | cc3dfac4a54bcdb534eb86be1f50a9791ea1a7c9 /builtin/read-tree.c | |
| parent | Merge branch 'cc/rev-list-allow-missing-tips' (diff) | |
| parent | fill_tree_descriptor(): mark error message for translation (diff) | |
| download | git-ae46d5fb98b316767f51a82fc0c1441174995a34.tar.gz git-ae46d5fb98b316767f51a82fc0c1441174995a34.zip | |
Merge branch 'js/merge-tree-3-trees'
"git merge-tree" has learned that the three trees involved in the
3-way merge only need to be trees, not necessarily commits.
* js/merge-tree-3-trees:
fill_tree_descriptor(): mark error message for translation
cache-tree: avoid an unnecessary check
Always check `parse_tree*()`'s return value
t4301: verify that merge-tree fails on missing blob objects
merge-ort: do check `parse_tree()`'s return value
merge-tree: fail with a non-zero exit code on missing tree objects
merge-tree: accept 3 trees as arguments
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 20e7db1973..1ffd863cff 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -261,7 +261,8 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) cache_tree_free(&the_index.cache_tree); for (i = 0; i < nr_trees; i++) { struct tree *tree = trees[i]; - parse_tree(tree); + if (parse_tree(tree) < 0) + return 128; init_tree_desc(t+i, tree->buffer, tree->size); } if (unpack_trees(nr_trees, t, &opts)) |