development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rerere: Fix removal of already resolved path.

Browse source 
There was an obvious thinko in memmove() to remove an entry that
was resolved from the in-core data structure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-04 00:06:50 -08:00
parent e27e609bbf
commit 3a2d3e8678
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
builtin-rerere.c
View file

@ -350,11 +350,10 @@ static int do_plain_rerere(struct path_list *rr, int fd)
fprintf(stderr, "Recorded resolution for '%s'.\n", path);
copy_file(path, rr_path(name, "postimage"));
tail_optimization:
if (i < rr->nr - 1) {
if (i < rr->nr - 1)
memmove(rr->items + i,
rr->items + i + 1,
rr->nr - i - 1);
}
rr->items + i + 1,
sizeof(rr->items[0]) * (rr->nr - i - 1));
rr->nr--;
i--;
}