Skip to content
Snippets Groups Projects
Commit 3055d78f authored by Clemens Buchacher's avatar Clemens Buchacher Committed by Junio C Hamano
Browse files

use persistent memory for rejected paths


An aborted merge prints the list of rejected paths as part of the
error message. Since commit f66caaf9 (do not overwrite files in
leading path), some of those paths do not have static buffers, so
we have to keep a copy. Use string_list's to accomplish this.

This changes the order of the list to the order in which the paths
are processed. Previously, it was reversed.

Signed-off-by: default avatarClemens Buchacher <drizzd@aon.at>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent b1735b1a
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment