From 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 11 Jan 2020 23:36:56 +0000 Subject: Squashed 'third_party/git/' content from commit cb71568594 git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7 --- t/t4023-diff-rename-typechange.sh | 87 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 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 000000000000..8c9823765e66 --- /dev/null +++ b/t/t4023-diff-rename-typechange.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +test_description='typechange rename detection' + +. ./test-lib.sh + +test_expect_success setup ' + + rm -f foo bar && + cat "$TEST_DIRECTORY"/../COPYING >foo && + test_ln_s_add linklink bar && + git add foo && + git commit -a -m Initial && + git tag one && + + git rm -f foo bar && + cat "$TEST_DIRECTORY"/../COPYING >bar && + test_ln_s_add linklink foo && + git add bar && + git commit -a -m Second && + git tag two && + + git rm -f foo bar && + cat "$TEST_DIRECTORY"/../COPYING >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 && + cat "$TEST_DIRECTORY"/../COPYING >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 && + cat "$TEST_DIRECTORY"/../COPYING >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 1.4.1