mirror of
https://github.com/git/git.git
synced 2025-03-15 08:12:22 +00:00
rerere: Fix removal of already resolved path.
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:
parent
e27e609bbf
commit
3a2d3e8678
@ -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--;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user