Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
cache-tree: convert write_*_as_tree to object_id
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index e8d9d4383ed69bd5783b0092a2ee221fc29ce439..0c7437f53677b6cef7e9d65334aa93fe3b052f76 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-639,7
+639,7
@@
static int read_tree_trivial(struct object_id *common, struct object_id *head,
static void write_tree_trivial(struct object_id *oid)
{
- if (write_cache_as_tree(oid
->hash
, 0, NULL))
+ if (write_cache_as_tree(oid, 0, NULL))
die(_("git write-tree failed to write a tree"));
}