2005-05-30 07:54:59 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Same rename detection as t4003 but testing diff-raw -z.
|
|
|
|
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
2021-02-12 21:29:40 +08:00
|
|
|
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'prepare reference tree' \
|
2021-02-12 21:29:40 +08:00
|
|
|
'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
|
2005-05-30 07:54:59 +08:00
|
|
|
echo frotz >rezrov &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git update-index --add COPYING rezrov &&
|
2019-08-26 09:43:44 +08:00
|
|
|
orig=$(git hash-object COPYING) &&
|
2007-07-03 13:52:14 +08:00
|
|
|
tree=$(git write-tree) &&
|
2005-05-30 07:54:59 +08:00
|
|
|
echo $tree'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'prepare work tree' \
|
|
|
|
'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
|
|
|
|
sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
|
|
|
|
rm -f COPYING &&
|
2019-08-26 09:43:44 +08:00
|
|
|
c1=$(git hash-object COPYING.1) &&
|
|
|
|
c2=$(git hash-object COPYING.2) &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git update-index --add --remove COPYING COPYING.?'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
# tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2,
|
|
|
|
# both are slightly edited, and unchanged rezrov. We say COPYING.1
|
|
|
|
# and COPYING.2 are based on COPYING, and do not say anything about
|
|
|
|
# rezrov.
|
|
|
|
|
2011-02-19 12:10:32 +08:00
|
|
|
git diff-index -z -C $tree >current
|
2005-05-30 07:54:59 +08:00
|
|
|
|
2019-08-26 09:43:44 +08:00
|
|
|
cat >expected <<EOF
|
|
|
|
:100644 100644 $orig $c1 C1234
|
2005-05-30 07:54:59 +08:00
|
|
|
COPYING
|
|
|
|
COPYING.1
|
2019-08-26 09:43:44 +08:00
|
|
|
:100644 100644 $orig $c2 R1234
|
2005-05-30 07:54:59 +08:00
|
|
|
COPYING
|
|
|
|
COPYING.2
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'validate output from rename/copy detection (#1)' \
|
2005-06-01 05:47:25 +08:00
|
|
|
'compare_diff_raw_z current expected'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
################################################################
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'prepare work tree again' \
|
|
|
|
'mv COPYING.2 COPYING &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git update-index --add --remove COPYING COPYING.1 COPYING.2'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
|
|
|
|
# both are slightly edited, and unchanged rezrov. We say COPYING.1
|
|
|
|
# is based on COPYING and COPYING is still there, and do not say anything
|
|
|
|
# about rezrov.
|
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
git diff-index -z -C $tree >current
|
2019-08-26 09:43:44 +08:00
|
|
|
cat >expected <<EOF
|
|
|
|
:100644 100644 $orig $c2 M
|
2005-05-30 07:54:59 +08:00
|
|
|
COPYING
|
2019-08-26 09:43:44 +08:00
|
|
|
:100644 100644 $orig $c1 C1234
|
2005-05-30 07:54:59 +08:00
|
|
|
COPYING
|
|
|
|
COPYING.1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'validate output from rename/copy detection (#2)' \
|
2005-06-01 05:47:25 +08:00
|
|
|
'compare_diff_raw_z current expected'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
################################################################
|
|
|
|
|
|
|
|
# tree has COPYING and rezrov. work tree has the same COPYING and
|
|
|
|
# copy-edited COPYING.1, and unchanged rezrov. We should not say
|
2014-04-01 06:11:47 +08:00
|
|
|
# anything about rezrov or COPYING, since the revised again diff-raw
|
2005-05-30 07:54:59 +08:00
|
|
|
# nows how to say Copy.
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'prepare work tree once again' \
|
2021-02-12 21:29:40 +08:00
|
|
|
'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git update-index --add --remove COPYING COPYING.1'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
git diff-index -z -C --find-copies-harder $tree >current
|
2019-08-26 09:43:44 +08:00
|
|
|
cat >expected <<EOF
|
|
|
|
:100644 100644 $orig $c1 C1234
|
2005-05-30 07:54:59 +08:00
|
|
|
COPYING
|
|
|
|
COPYING.1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'validate output from rename/copy detection (#3)' \
|
2005-06-01 05:47:25 +08:00
|
|
|
'compare_diff_raw_z current expected'
|
2005-05-30 07:54:59 +08:00
|
|
|
|
|
|
|
test_done
|