git-p4: test --keep-path

Make sure it leaves the path, below //depot, in git.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index cc0fd26d367a74e26fb52ba7a3a2357c3f81fc3a..6b288acbd76136de2dd14d23c82f543430774c4c 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -93,6 +93,30 @@ test_expect_success 'clone --max-changes' '
        )
 '
 
+test_expect_success 'clone --keep-path' '
+       (
+               cd "$cli" &&
+               mkdir -p sub/dir &&
+               echo f4 >sub/dir/f4 &&
+               p4 add sub/dir/f4 &&
+               p4 submit -d "change 4"
+       ) &&
+       "$GITP4" clone --dest="$git" --keep-path //depot/sub/dir@all &&
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               test_path_is_missing f4 &&
+               test_path_is_file sub/dir/f4
+       ) &&
+       cleanup_git &&
+       "$GITP4" clone --dest="$git" //depot/sub/dir@all &&
+       (
+               cd "$git" &&
+               test_path_is_file f4 &&
+               test_path_is_missing sub/dir/f4
+       )
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '