mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
655ee9ea3e
The prefix_path_gently() function currently applies real_path to everything if given an absolute path, dereferencing symlinks both outside and inside the work tree. This causes most high-level functions to misbehave when acting on symlinks given via absolute paths. For example $ git add /dir/repo/symlink attempts to add the target of the symlink rather than the symlink itself, which is usually not what the user intends to do. In order to manipulate symlinks in the work tree using absolute paths, symlinks should only be dereferenced outside the work tree. Modify the prefix_path_gently() to first normalize the path in order to make sure path levels are separated by '/', then pass the result to 'abspath_part_inside_repo' to find the part inside the work tree (without dereferencing any symlinks inside the work tree). For absolute paths, prefix_path_gently() did not, nor does now do, any actual prefixing, hence the result from abspath_part_in_repo() is returned as-is. Fixes t0060-82 and t3004-5. Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com> Reviewed-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.2 KiB
Bash
Executable file
56 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='basic ls-files tests
|
|
|
|
This test runs git ls-files with various unusual or malformed
|
|
command-line arguments.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
>empty
|
|
|
|
test_expect_success 'ls-files in empty repository' '
|
|
git ls-files >actual &&
|
|
test_cmp empty actual
|
|
'
|
|
|
|
test_expect_success 'ls-files with nonexistent path' '
|
|
git ls-files doesnotexist >actual &&
|
|
test_cmp empty actual
|
|
'
|
|
|
|
test_expect_success 'ls-files with nonsense option' '
|
|
test_expect_code 129 git ls-files --nonsense 2>actual &&
|
|
test_i18ngrep "[Uu]sage: git ls-files" actual
|
|
'
|
|
|
|
test_expect_success 'ls-files -h in corrupt repository' '
|
|
mkdir broken &&
|
|
(
|
|
cd broken &&
|
|
git init &&
|
|
>.git/index &&
|
|
test_expect_code 129 git ls-files -h >usage 2>&1
|
|
) &&
|
|
test_i18ngrep "[Uu]sage: git ls-files " broken/usage
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' '
|
|
mkdir subs &&
|
|
ln -s nosuch link &&
|
|
ln -s ../nosuch subs/link &&
|
|
git add link subs/link &&
|
|
git ls-files -s link subs/link >expect &&
|
|
git ls-files -s "$(pwd)/link" "$(pwd)/subs/link" >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
(
|
|
cd subs &&
|
|
git ls-files -s link >../expect &&
|
|
git ls-files -s "$(pwd)/link" >../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|