mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
diff test: add tests for combine-diff with orderfile
In the next patch combine-diff will have special code-path for taking orderfile into account. Prepare for making changes by introducing coverage tests for that case. Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1df4320fa2
commit
91921ceff6
|
@ -97,4 +97,25 @@ do
|
||||||
'
|
'
|
||||||
done
|
done
|
||||||
|
|
||||||
|
test_expect_success 'setup for testing combine-diff order' '
|
||||||
|
git checkout -b tmp HEAD~ &&
|
||||||
|
create_files 3 &&
|
||||||
|
git checkout master &&
|
||||||
|
git merge --no-commit -s ours tmp &&
|
||||||
|
create_files 5
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success "combine-diff: no order (=tree object order)" '
|
||||||
|
git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
|
||||||
|
test_cmp expect_none actual
|
||||||
|
'
|
||||||
|
|
||||||
|
for i in 1 2
|
||||||
|
do
|
||||||
|
test_expect_success "combine-diff: orderfile using option ($i)" '
|
||||||
|
git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
|
||||||
|
test_cmp expect_$i actual
|
||||||
|
'
|
||||||
|
done
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue