| commit | f5184380f08c814535e7bda374e403596eef90a3 | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Thu, 4 Jan 2007 10:22:47 +0000 (4 11:22 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 Jan 2007 22:45:20 +0000 (10 14:45 -0800) | ||
| tree | ebf850c18f995e683eababbc7ea412db921c8438 | treesnapshot (tar.gz zip) |
| parent | 2a3a3c247e7f1f257e9c6762e48b98f08a30011a | commitdiff |
Speed-up recursive by flushing index only once for all entries
The merge-recursive implementation in C inherited the invariant
that the on-file index file is written out and later read back
after any index operations and writing trees from the original
Python implementation. But it was only because the original
implementation worked at the scripting level.
There is no need to write out the index file after handling
every path.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
The merge-recursive implementation in C inherited the invariant
that the on-file index file is written out and later read back
after any index operations and writing trees from the original
Python implementation. But it was only because the original
implementation worked at the scripting level.
There is no need to write out the index file after handling
every path.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |