reset: use "unpack_trees()" directly instead of "git read-tree"
commitd0f379c2dcf7198d373b3c64444019bed2e24336
authorStephan Beyer <s-beyer@gmx.net>
Wed, 30 Dec 2009 05:54:47 +0000 (30 06:54 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Jan 2010 23:59:14 +0000 (3 15:59 -0800)
tree1e40a82760901805088012985b96b29ea74f2bab
parentc93966906f5d578d06eee0ead8745e608a6e18cf
reset: use "unpack_trees()" directly instead of "git read-tree"

This patch makes "reset_index_file()" call "unpack_trees()" directly
instead of forking and execing "git read-tree". So the code is more
efficient.

And it's also easier to see which unpack_tree() options will be used,
as we don't need to follow "git read-tree"'s command line parsing
which is quite complex.

As Daniel Barkalow found, there is a difference between this new
version and the old one. The old version gives an error for
"git reset --merge" with unmerged entries, and the new version does
not when we reset the entries to some states that differ from HEAD.
Instead, it resets the index entry and succeeds, while leaving the
conflict markers in the corresponding file in the work tree (which
will be corrected by the next patch).

The code comes from the sequencer GSoC project:

git://repo.or.cz/git/sbeyer.git

(at commit 5a78908b70ceb5a4ea9fd4b82f07ceba1f019079)

Mentored-by: Daniel Barkalow <barkalow@iabervon.org>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-reset.txt
builtin-reset.c
t/t7110-reset-merge.sh