| commit | b48d5a050afa30402c8281c223df9d7e58b4493c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 10 Aug 2007 19:15:54 +0000 (10 12:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Aug 2007 20:59:19 +0000 (10 13:59 -0700) | ||
| tree | 43120ddc2fbdd17457ae285e5429417b22a70ea0 | treesnapshot (tar.gz zip) |
| parent | 79f5e0645ac7239bb0b019f2595bca18d469a280 | commitdiff |
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>
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 | diffblobblamehistory | |
| unpack-trees.h | diffblobblamehistory |