Merge branch 'eb/hash-transition'

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index 86179c34102de01b126aeb11fce50054aa2ac74f..752a937fa93dd3bf8703400c6311afe7a5265e02 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,4 @@
 #include "git-compat-util.h"
-#include "diff.h"
-#include "diffcore.h"
 #include "gettext.h"
 #include "hash.h"
 #include "hex.h"
@@ -13,7 +11,6 @@
 #include "tree.h"
 #include "tree-walk.h"
 #include "unpack-trees.h"
-#include "dir.h"
 
 static const char *merge_argument(struct commit *commit)
 {
@@ -80,7 +77,10 @@ int checkout_fast_forward(struct repository *r,
                return -1;
        }
        for (i = 0; i < nr_trees; i++) {
-               parse_tree(trees[i]);
+               if (parse_tree(trees[i]) < 0) {
+                       rollback_lock_file(&lock_file);
+                       return -1;
+               }
                init_tree_desc(t+i, &trees[i]->object.oid,
                               trees[i]->buffer, trees[i]->size);
        }