From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- t/t6407-merge-binary.sh | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100755 t/t6407-merge-binary.sh (limited to 't/t6407-merge-binary.sh') diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh new file mode 100755 index 0000000..e8a2871 --- /dev/null +++ b/t/t6407-merge-binary.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +test_description='ask merge-recursive to merge binary files' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success setup ' + + cat "$TEST_DIRECTORY"/test-binary-1.png >m && + git add m && + git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && + test_tick && + git commit -m "initial" && + + git branch side && + echo frotz >a && + git add a && + echo nitfol >>m && + git add a m && + git ls-files -s a >E0 && + git ls-files -s m | sed -e "s/ 0 / 3 /" >E3 && + test_tick && + git commit -m "main adds some" && + + git checkout side && + echo rezrov >>m && + git add m && + git ls-files -s m | sed -e "s/ 0 / 2 /" >E2 && + test_tick && + git commit -m "side modifies" && + + git tag anchor && + + cat E0 E1 E2 E3 >expect +' + +test_expect_success resolve ' + + rm -f a* m* && + git reset --hard anchor && + + test_must_fail git merge -s resolve main && + git ls-files -s >current && + test_cmp expect current +' + +test_expect_success recursive ' + + rm -f a* m* && + git reset --hard anchor && + + test_must_fail git merge -s recursive main && + git ls-files -s >current && + test_cmp expect current +' + +test_done -- cgit v1.2.3