]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 79f5e06) | patch
Move old index entry removal from "unpack_trees()" into the individual functions
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Aug 2007 19:15:54 +0000 (12:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Aug 2007 20:59:19 +0000 (13:59 -0700)
commitb48d5a050afa30402c8281c223df9d7e58b4493c
tree43120ddc2fbdd17457ae285e5429417b22a70ea0tree | snapshot
parent79f5e0645ac7239bb0b019f2595bca18d469a280commit | diff
Move old index entry removal from "unpack_trees()" into the individual functions

This makes no changes to current code, but it allows the individual merge
functions to decide what to do about the old entry.  They might decide to
update it in place, rather than force them to always delete and re-add it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
unpack-trees.c diff | blob | blame | history
unpack-trees.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.