Merge branch 'nd/upload-pack-shallow'

diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index eeefa6790454d83bfb4ce740f7b1843c6a71c79c..66d3fc91a739a7f04bb73694a2f5d75034045d10 100755 (executable)
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -28,7 +28,7 @@ test_expect_success 'p4 client newlines, unix' '
                test_cmp f-unix-orig f-unix &&
 
                # make sure stored in repo as unix newlines
-               # use sed to eat python-appened newline
+               # use sed to eat python-appended newline
                p4 -G print //depot/f-unix | marshal_dump data 2 |\
                    sed \$d >f-unix-p4-print &&
                test_cmp f-unix-orig f-unix-p4-print &&
@@ -95,7 +95,7 @@ test_expect_success 'gitattributes setting eol=lf produces lf newlines' '
                git init &&
                echo "* eol=lf" >.gitattributes &&
                git p4 sync //depot@all &&
-               git checkout master &&
+               git checkout -b master p4/master &&
                test_cmp "$cli"/f-unix-orig f-unix &&
                test_cmp "$cli"/f-win-as-lf f-win
        )
@@ -109,7 +109,7 @@ test_expect_success 'gitattributes setting eol=crlf produces crlf newlines' '
                git init &&
                echo "* eol=crlf" >.gitattributes &&
                git p4 sync //depot@all &&
-               git checkout master &&
+               git checkout -b master p4/master &&
                test_cmp "$cli"/f-unix-as-crlf f-unix &&
                test_cmp "$cli"/f-win-orig f-win
        )
@@ -250,6 +250,89 @@ test_expect_success 'ignore apple' '
        )
 '
 
+test_expect_success SYMLINKS 'create p4 symlink' '
+       cd "$cli" &&
+       ln -s symlink-target symlink &&
+       p4 add symlink &&
+       p4 submit -d "add symlink"
+'
+
+test_expect_success SYMLINKS 'ensure p4 symlink parsed correctly' '
+       test_when_finished cleanup_git &&
+       git p4 clone --dest="$git" //depot@all &&
+       (
+               cd "$git" &&
+               test -L symlink &&
+               test $(readlink symlink) = symlink-target
+       )
+'
+
+test_expect_success SYMLINKS 'empty symlink target' '
+       (
+               # first create the file as a file
+               cd "$cli" &&
+               >empty-symlink &&
+               p4 add empty-symlink &&
+               p4 submit -d "add empty-symlink as a file"
+       ) &&
+       (
+               # now change it to be a symlink to "target1"
+               cd "$cli" &&
+               p4 edit empty-symlink &&
+               p4 reopen -t symlink empty-symlink &&
+               rm empty-symlink &&
+               ln -s target1 empty-symlink &&
+               p4 add empty-symlink &&
+               p4 submit -d "make empty-symlink point to target1"
+       ) &&
+       (
+               # Hack the p4 depot to make the symlink point to nothing;
+               # this should not happen in reality, but shows up
+               # in p4 repos in the wild.
+               #
+               # The sed expression changes this:
+               #     @@
+               #     text
+               #     @target1
+               #     @
+               # to this:
+               #     @@
+               #     text
+               #     @@
+               #
+               cd "$db/depot" &&
+               sed "/@target1/{; s/target1/@/; n; d; }" \
+                   empty-symlink,v >empty-symlink,v.tmp &&
+               mv empty-symlink,v.tmp empty-symlink,v
+       ) &&
+       (
+               # Make sure symlink really is empty.  Asking
+               # p4 to sync here will make it generate errors.
+               cd "$cli" &&
+               p4 print -q //depot/empty-symlink#2 >out &&
+               test ! -s out
+       ) &&
+       test_when_finished cleanup_git &&
+
+       # make sure git p4 handles it without error
+       git p4 clone --dest="$git" //depot@all &&
+
+       # fix the symlink, make it point to "target2"
+       (
+               cd "$cli" &&
+               p4 open empty-symlink &&
+               rm empty-symlink &&
+               ln -s target2 empty-symlink &&
+               p4 submit -d "make empty-symlink point to target2"
+       ) &&
+       cleanup_git &&
+       git p4 clone --dest="$git" //depot@all &&
+       (
+               cd "$git" &&
+               test $(readlink empty-symlink) = target2
+       )
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '