diff options
| -rw-r--r-- | builtin-blame.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 897323a4b2..fb30c49280 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2005,7 +2005,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con buf[fin_size] = 0; origin->file.ptr = buf; origin->file.size = fin_size; - write_sha1_file(buf, fin_size, blob_type, origin->blob_sha1); + pretend_sha1_file(buf, fin_size, blob_type, origin->blob_sha1); commit->util = origin; /* diff --git a/merge-recursive.c b/merge-recursive.c index a68fcc6f37..58989424d7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1213,7 +1213,7 @@ static int merge(struct commit *h1, tree->object.parsed = 1; tree->object.type = OBJ_TREE; - write_sha1_file(NULL, 0, tree_type, tree->object.sha1); + pretend_sha1_file(NULL, 0, tree_type, tree->object.sha1); merged_common_ancestors = make_virtual_commit(tree, "ancestor"); } |