resolve-undo: allow plumbing to clear the information
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Dec 2009 18:31:26 +0000 (10:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 01:10:10 +0000 (17:10 -0800)
commit4a39f79d3482cd844443b4ef9a8ef9b3d72faa5b
tree0755156205fdd15cb3a72224e5ebc718f40f9a3e
parent9d9a2f4aba3650093bad952cd89e276cde4ed074
resolve-undo: allow plumbing to clear the information

At the Porcelain level, operations such as merge that populate an
initially cleanly merged index with conflicted entries clear the
resolve-undo information upfront.  Give scripted Porcelains a way
to do the same, by implementing "update-index --clear-resolve-info".

With this, a scripted Porcelain may "update-index --clear-resolve-info"
first and repeatedly run "update-index --cacheinfo" to stuff unmerged
entries to the index, to be resolved by the user with "git add" and
stuff.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-update-index.c
t/t2030-unresolve-info.sh