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/t4023-diff-rename-typechange.sh | 88 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 t/t4023-diff-rename-typechange.sh (limited to 't/t4023-diff-rename-typechange.sh') diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh new file mode 100755 index 0000000..7cb9909 --- /dev/null +++ b/t/t4023-diff-rename-typechange.sh @@ -0,0 +1,88 @@ +#!/bin/sh + +test_description='typechange rename detection' + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-diff.sh + +test_expect_success setup ' + + rm -f foo bar && + COPYING_test_data >foo && + test_ln_s_add linklink bar && + git add foo && + git commit -a -m Initial && + git tag one && + + git rm -f foo bar && + COPYING_test_data >bar && + test_ln_s_add linklink foo && + git add bar && + git commit -a -m Second && + git tag two && + + git rm -f foo bar && + COPYING_test_data >foo && + git add foo && + git commit -a -m Third && + git tag three && + + mv foo bar && + test_ln_s_add linklink foo && + git add bar && + git commit -a -m Fourth && + git tag four && + + # This is purely for sanity check + + git rm -f foo bar && + COPYING_test_data >foo && + cat "$TEST_DIRECTORY"/../Makefile >bar && + git add foo bar && + git commit -a -m Fifth && + git tag five && + + git rm -f foo bar && + cat "$TEST_DIRECTORY"/../Makefile >foo && + COPYING_test_data >bar && + git add foo bar && + git commit -a -m Sixth && + git tag six + +' + +test_expect_success 'cross renames to be detected for regular files' ' + + git diff-tree five six -r --name-status -B -M | sort >actual && + { + echo "R100 foo bar" && + echo "R100 bar foo" + } | sort >expect && + test_cmp expect actual + +' + +test_expect_success 'cross renames to be detected for typechange' ' + + git diff-tree one two -r --name-status -B -M | sort >actual && + { + echo "R100 foo bar" && + echo "R100 bar foo" + } | sort >expect && + test_cmp expect actual + +' + +test_expect_success 'moves and renames' ' + + git diff-tree three four -r --name-status -B -M | sort >actual && + { + # see -B -M (#6) in t4008 + echo "C100 foo bar" && + echo "T100 foo" + } | sort >expect && + test_cmp expect actual + +' + +test_done -- cgit v1.2.3