]> git.ipfire.org Git - thirdparty/git.git/commit - builtin-merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f518438) | patch
merge-recursive: do not use on-file index when not needed.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Jan 2007 19:20:58 +0000 (11:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Jan 2007 22:45:20 +0000 (14:45 -0800)
commit8b944b5678efcbbbedfd555e5eef1500dc6074d1
treecdc501b84f1ac9c04b68086c40f0efa44287bf7atree | snapshot
parentf5184380f08c814535e7bda374e403596eef90a3commit | diff
merge-recursive: do not use on-file index when not needed.

This revamps the merge-recursive implementation following the
outline in:

Message-ID: <7v8xgileza.fsf@assigned-by-dhcp.cox.net>

There is no need to write out the index until the very end just
once from merge-recursive.  Also there is no need to write out
the resulting tree object for the simple case of merging with a
single merge base.

Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.