diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2013-10-26 16:43:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 10:35:20 -0800 |
| commit | 729bbcea374f7171a4dafd995992d3c1aa525cda (patch) | |
| tree | 33e76b698c9730dd342b2d029988a64c9145a729 /t/t3030-merge-recursive.sh | |
| parent | 5ac920e96bb6145532f094cbf765a87d2dbe1251 (diff) | |
| download | git-tr/merge-recursive-index-only.tar.gz | |
merge-recursive: -Xindex-only to leave worktree unchangedtr/merge-recursive-index-only
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 2f96100a5f..2f3a16ca53 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -296,6 +296,19 @@ test_expect_success 'merge-recursive result' ' ' +test_expect_success 'merge-recursive --index-only' ' + + rm -fr [abcd] && + git checkout -f "$c2" && + test_expect_code 1 git merge-recursive --index-only "$c0" -- "$c2" "$c1" && + git ls-files -s >actual && + # reuses "expected" from previous test! + test_cmp expected actual && + git diff HEAD >actual-diff && + : >expected-diff && + test_cmp expected-diff actual-diff +' + test_expect_success 'fail if the index has unresolved entries' ' rm -fr [abcd] && |