summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2010-11-15 20:52:19 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 08:55:13 -0800
commit3055d78f97da105acfc0e207266e902251d2949f (patch)
tree77037a51ded54618ba33a5f1466a340c42802b3a /GIT-VERSION-GEN
parentdo not overwrite files in leading path (diff)
downloadtgif-3055d78f97da105acfc0e207266e902251d2949f.tar.xz
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: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions