diff options
| author | James Bottomley <James.Bottomley@SteelEye.com> | 2005-04-18 11:44:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 11:44:31 -0700 |
| commit | a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5 (patch) | |
| tree | ffff612a9cb5d5f390c1aeadaf2bd1e8c3d33ded /merge-base.c | |
| parent | 1bc992acacf5961e65d9fdddeb8561284e708c74 (diff) | |
| download | git-a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5.tar.gz git-a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5.tar.xz | |
[PATCH] fix bug in read-cache.c which loses files when merging a tree
I noticed this when I tried a non-trivial scsi merge and checked the
results against BK. The problem is that remove_entry_at() actually
decrements active_nr, so decrementing it in add_cache_entry() before
calling remove_entry_at() is a double decrement (hence we lose cache
entries at the end).
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions