cache-tree: use is_empty_tree_oid

diff --git a/merge.c b/merge.c
index 195b5787005ee8f63bc10845f6d788aa4730a61b..5186cb6156f2d37dfeb287f959adbbaf4bb73afc 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -11,10 +11,7 @@
 
 static const char *merge_argument(struct commit *commit)
 {
-       if (commit)
-               return oid_to_hex(&commit->object.oid);
-       else
-               return EMPTY_TREE_SHA1_HEX;
+       return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
 }
 
 int index_has_changes(struct strbuf *sb)
@@ -113,17 +110,23 @@ int checkout_fast_forward(const struct object_id *head,
        setup_unpack_trees_porcelain(&opts, "merge");
 
        trees[nr_trees] = parse_tree_indirect(head);
-       if (!trees[nr_trees++])
+       if (!trees[nr_trees++]) {
+               rollback_lock_file(&lock_file);
                return -1;
+       }
        trees[nr_trees] = parse_tree_indirect(remote);
-       if (!trees[nr_trees++])
+       if (!trees[nr_trees++]) {
+               rollback_lock_file(&lock_file);
                return -1;
+       }
        for (i = 0; i < nr_trees; i++) {
                parse_tree(trees[i]);
                init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
        }
-       if (unpack_trees(nr_trees, t, &opts))
+       if (unpack_trees(nr_trees, t, &opts)) {
+               rollback_lock_file(&lock_file);
                return -1;
+       }
        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
                return error(_("unable to write new index file"));
        return 0;