[PATCH] rerere: Fix removal of already resolved path.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- * If you were seeing mysterious "Cannot open" messages after "git merge", "git rebase", and "git am" runs, this should fix them. builtin-rerere.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 7442498..079c0bd 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c@@ -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--; }