diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-09 23:54:01 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 23:54:01 +0400 |
commit | a75e759e595bf79d69841e6822784164da54ac23 (patch) | |
tree | f97647066886af7abca346f480ad41456a841c7b /t | |
parent | 4645b014c5c82a3b753374e7ea2bb1e7d7d3e562 (diff) | |
parent | ccad42d4836e2bb4d1843eccd94f58f0189abb1d (diff) |
Merge branch 'rs/refresh-beyond-symlink'
"git add x" where x that used to be a directory has become a
symbolic link to a directory misbehaved.
* rs/refresh-beyond-symlink:
read-cache: check for leading symlinks when refreshing index
Diffstat (limited to 't')
-rwxr-xr-x | t/t7515-status-symlinks.sh | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/t/t7515-status-symlinks.sh b/t/t7515-status-symlinks.sh new file mode 100755 index 0000000000..9f989be01b --- /dev/null +++ b/t/t7515-status-symlinks.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +test_description='git status and symlinks' + +. ./test-lib.sh + +test_expect_success 'setup' ' + echo .gitignore >.gitignore && + echo actual >>.gitignore && + echo expect >>.gitignore && + mkdir dir && + echo x >dir/file1 && + echo y >dir/file2 && + git add dir && + git commit -m initial && + git tag initial +' + +test_expect_success SYMLINKS 'symlink to a directory' ' + test_when_finished "rm symlink" && + ln -s dir symlink && + echo "?? symlink" >expect && + git status --porcelain >actual && + test_cmp expect actual +' + +test_expect_success SYMLINKS 'symlink replacing a directory' ' + test_when_finished "rm -rf copy && git reset --hard initial" && + mkdir copy && + cp dir/file1 copy/file1 && + echo "changed in copy" >copy/file2 && + git add copy && + git commit -m second && + rm -rf copy && + ln -s dir copy && + echo " D copy/file1" >expect && + echo " D copy/file2" >>expect && + echo "?? copy" >>expect && + git status --porcelain >actual && + test_cmp expect actual +' + +test_done |