Code

use persistent memory for rejected paths
authorClemens Buchacher <drizzd@aon.at>
Mon, 15 Nov 2010 19:52:19 +0000 (20:52 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 23:05:34 +0000 (15:05 -0800)
commit7980872d4ef3ce24329cbdb6d61dc2ed48cbf1c5
tree15224e4692f6adf3be1f1ef945583aa9de0adb42
parentf66caaf9c8e0feb840a439a58e165b963aec79cf
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>
t/t7607-merge-overwrite.sh
t/t7609-merge-co-error-msgs.sh
unpack-trees.c
unpack-trees.h