diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:52:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:52:19 -0800 |
| commit | 8042ed1cebd37419ff38f540482355c0f1d30936 (patch) | |
| tree | 8cc29ba2b6f5eac2d46f5222e8ff1dc1e7f6a7bd /merge-recursive.c | |
| parent | e2b7008752d85874919ea718d098fec01b4a9019 (diff) | |
| parent | c53d696bcc2894b0df277e617740b15bac794df9 (diff) | |
| download | git-8042ed1cebd37419ff38f540482355c0f1d30936.tar.gz | |
Merge branch 'master' into js/merge
* master: (42 commits)
git-svn: correctly handle packed-refs in refs/remotes/
add test case for recursive merge
git-svn: correctly display fatal() error messages
git-svn: allow dcommit to take an alternate head
git-svn: enable logging of information not supported by git
Clarify fetch error for missing objects.
Move Fink and Ports check to after config file
shortlog: fix segfault on empty authorname
shortlog: remove "[PATCH]" prefix from shortlog output
Make sure the empty tree exists when needed in merge-recursive.
Don't use memcpy when source and dest. buffers may overlap
no need to install manpages as executable
Documentation: simpler shared repository creation
shortlog: fix segfault on empty authorname
Add branch.*.merge warning and documentation update
Fix perl/ build.
git-svn: use do_switch for --follow-parent if the SVN library supports it
Fix documentation copy&paste typo
git-svn: extra error check to ensure we open a file correctly
Documentation: update git-clone man page with new behavior
...
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 6e13b8ed5b..9d53bcd5d6 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1222,7 +1222,7 @@ static int merge(struct commit *h1, tree->object.parsed = 1; tree->object.type = OBJ_TREE; - hash_sha1_file(NULL, 0, tree_type, tree->object.sha1); + write_sha1_file(NULL, 0, tree_type, tree->object.sha1); merged_common_ancestors = make_virtual_commit(tree, "ancestor"); } |