diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-04 21:49:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-05 14:55:11 -0800 |
| commit | 005f85d9ae95c44d8c6ecf61364642fbcaf49dd2 (patch) | |
| tree | 7e5fc9be65d54b8f55d970493cc45b935a341586 /merge-recursive.c | |
| parent | d66b37bb19ff7a347ba4ccbcdc11b00772518b57 (diff) | |
| download | git-005f85d9ae95c44d8c6ecf61364642fbcaf49dd2.tar.gz | |
Use pretend_sha1_file() in git-blame and git-merge-recursive.
git-merge-recursive wants an null tree as the fake merge base
while producing the merge result tree. The null tree does not
have to be written out in the object store as it won't be part
of the result, and it is a prime example for using the new
pretend_sha1_file() function.
git-blame needs to register an arbitrary data to in-core index
while annotating a working tree file (or standard input), but
git-blame is a read-only application and the user of it could
even lack the privilege to write into the object store; it is
another good example for pretend_sha1_file().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); } |