diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2009-12-30 06:54:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-03 15:59:14 -0800 |
| commit | d0f379c2dcf7198d373b3c64444019bed2e24336 (patch) | |
| tree | 1e40a82760901805088012985b96b29ea74f2bab /t | |
| parent | reset: add a few tests for "git reset --merge" (diff) | |
| download | tgif-d0f379c2dcf7198d373b3c64444019bed2e24336.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7110-reset-merge.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index 4c46083bec..ff2875c00b 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -135,12 +135,14 @@ test_expect_success 'setup 2 different branches' ' # # working index HEAD target working index HEAD # ---------------------------------------------------- -# file1: X U B C --merge (disallowed) -test_expect_success '"reset --merge HEAD^" fails with pending merge' ' +# file1: X U B C --merge X C C +test_expect_success '"reset --merge HEAD^" is ok with pending merge' ' test_must_fail git merge branch1 && - test_must_fail git reset --merge HEAD^ && - test "$(git rev-parse HEAD)" = "$(git rev-parse third)" && - test -n "$(git diff --cached)" + cat file1 >orig_file1 && + git reset --merge HEAD^ && + test "$(git rev-parse HEAD)" = "$(git rev-parse second)" && + test -z "$(git diff --cached)" && + test_cmp file1 orig_file1 ' # The next test will test the following: |