mirror of
https://github.com/git/git.git
synced 2026-01-08 09:13:48 +00:00
5d2be7425c
"git diff-files -R --find-copies-harder" has been taught to use the potential copy sources from the index correctly. * rs/diff-files-r-find-copies-fix: diff-files: fix copy detection
123 lines
3.6 KiB
Bash
Executable File
123 lines
3.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Rename interaction with pathspec.
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
|
|
|
|
test_expect_success 'prepare reference tree' '
|
|
mkdir path0 path1 &&
|
|
COPYING_test_data >path0/COPYING &&
|
|
git update-index --add path0/COPYING &&
|
|
tree=$(git write-tree) &&
|
|
blob=$(git rev-parse :path0/COPYING)
|
|
'
|
|
|
|
test_expect_success 'prepare work tree' '
|
|
cp path0/COPYING path1/COPYING &&
|
|
git update-index --add --remove path0/COPYING path1/COPYING
|
|
'
|
|
|
|
# In the tree, there is only path0/COPYING. In the cache, path0 and
|
|
# path1 both have COPYING and the latter is a copy of path0/COPYING.
|
|
# Comparing the full tree with cache should tell us so.
|
|
|
|
cat >expected <<EOF
|
|
:100644 100644 $blob $blob C100 path0/COPYING path1/COPYING
|
|
EOF
|
|
|
|
test_expect_success 'copy detection' '
|
|
git diff-index -C --find-copies-harder $tree >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_expect_success 'copy detection, cached' '
|
|
git diff-index -C --find-copies-harder --cached $tree >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_expect_success 'exit code of quiet copy detection' '
|
|
test_expect_code 1 \
|
|
git diff --quiet --cached --find-copies-harder $tree
|
|
'
|
|
|
|
test_expect_success 'exit code of quiet copy detection with --no-ext-diff' '
|
|
test_expect_code 1 \
|
|
git diff --quiet --cached --find-copies-harder --no-ext-diff $tree
|
|
'
|
|
|
|
# In the tree, there is only path0/COPYING. In the cache, path0 and
|
|
# path1 both have COPYING and the latter is a copy of path0/COPYING.
|
|
# However when we say we care only about path1, we should just see
|
|
# path1/COPYING suddenly appearing from nowhere, not detected as
|
|
# a copy from path0/COPYING.
|
|
|
|
cat >expected <<EOF
|
|
:000000 100644 $ZERO_OID $blob A path1/COPYING
|
|
EOF
|
|
|
|
test_expect_success 'copy, limited to a subtree' '
|
|
git diff-index -C --find-copies-harder $tree path1 >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_expect_success 'tweak work tree' '
|
|
rm -f path0/COPYING
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
:100644 100644 $blob $blob C100 path1/COPYING path0/COPYING
|
|
EOF
|
|
|
|
# The cache has path0/COPYING and path1/COPYING, the working tree only
|
|
# path1/COPYING. This is a deletion -- we don't treat deduplication
|
|
# specially. In reverse it should be detected as a copy, though.
|
|
test_expect_success 'copy detection, files to index' '
|
|
git diff-files -C --find-copies-harder -R >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_expect_success 'copy detection, files to preloaded index' '
|
|
GIT_TEST_PRELOAD_INDEX=1 \
|
|
git diff-files -C --find-copies-harder -R >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_expect_success 'tweak index' '
|
|
git update-index --remove path0/COPYING
|
|
'
|
|
# In the tree, there is only path0/COPYING. In the cache, path0 does
|
|
# not have COPYING anymore and path1 has COPYING which is a copy of
|
|
# path0/COPYING. Showing the full tree with cache should tell us about
|
|
# the rename.
|
|
|
|
cat >expected <<EOF
|
|
:100644 100644 $blob $blob R100 path0/COPYING path1/COPYING
|
|
EOF
|
|
|
|
test_expect_success 'rename detection' '
|
|
git diff-index -C --find-copies-harder $tree >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
# In the tree, there is only path0/COPYING. In the cache, path0 does
|
|
# not have COPYING anymore and path1 has COPYING which is a copy of
|
|
# path0/COPYING. When we say we care only about path1, we should just
|
|
# see path1/COPYING appearing from nowhere.
|
|
|
|
cat >expected <<EOF
|
|
:000000 100644 $ZERO_OID $blob A path1/COPYING
|
|
EOF
|
|
|
|
test_expect_success 'rename, limited to a subtree' '
|
|
git diff-index -C --find-copies-harder $tree path1 >current &&
|
|
compare_diff_raw current expected
|
|
'
|
|
|
|
test_done
|