| commit | 8b944b5678efcbbbedfd555e5eef1500dc6074d1 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 Jan 2007 19:20:58 +0000 (10 11:20 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 Jan 2007 22:45:20 +0000 (10 14:45 -0800) | ||
| tree | cdc501b84f1ac9c04b68086c40f0efa44287bf7a | treesnapshot (tar.gz zip) |
| parent | f5184380f08c814535e7bda374e403596eef90a3 | commitdiff |
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>
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 | diffblobblamehistory |