From: Kirill Smelkov Date: Mon, 20 Jan 2014 16:20:39 +0000 (+0400) Subject: diff test: add tests for combine-diff with orderfile X-Git-Tag: v2.0.0-rc0~146^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91921ceff60ccf7a9e80749eb28fabfb8399d371;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index 9e2b29ede5..c0460bb0e5 100755 --- a/t/t4056-diff-order.sh +++ b/t/t4056-diff-order.sh @@ -97,4 +97,25 @@ do ' 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