grep: use get_pathspec() correctly

diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index c1ea4d445caa1bd30a7c97547b635d84abfbdb9e..abe7c64ba9ca8442f4c50d15fffeefd6bba02b5f 100755 (executable)
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh
@@ -37,11 +37,27 @@ test_expect_success 'add p4 files' '
        echo file1 >file1 &&
        p4 add file1 &&
        p4 submit -d "file1" &&
+       echo file2 >file2 &&
+       p4 add file2 &&
+       p4 submit -d "file2" &&
        cd "$TRASH_DIRECTORY"
 '
 
 test_expect_success 'basic git-p4 clone' '
        "$GITP4" clone --dest="$git" //depot &&
+       cd "$git" &&
+       git log --oneline >lines &&
+       test_line_count = 1 lines &&
+       cd .. &&
+       rm -rf "$git" && mkdir "$git"
+'
+
+test_expect_success 'git-p4 clone @all' '
+       "$GITP4" clone --dest="$git" //depot@all &&
+       cd "$git" &&
+       git log --oneline >lines &&
+       test_line_count = 2 lines &&
+       cd .. &&
        rm -rf "$git" && mkdir "$git"
 '
 
@@ -58,6 +74,38 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
        test_must_fail grep -q Traceback errs
 '
 
+test_expect_success 'add p4 files with wildcards in the names' '
+       cd "$cli" &&
+       echo file-wild-hash >file-wild#hash &&
+       echo file-wild-star >file-wild\*star &&
+       echo file-wild-at >file-wild@at &&
+       echo file-wild-percent >file-wild%percent &&
+       p4 add -f file-wild* &&
+       p4 submit -d "file wildcards" &&
+       cd "$TRASH_DIRECTORY"
+'
+
+test_expect_success 'wildcard files git-p4 clone' '
+       "$GITP4" clone --dest="$git" //depot &&
+       cd "$git" &&
+       test -f file-wild#hash &&
+       test -f file-wild\*star &&
+       test -f file-wild@at &&
+       test -f file-wild%percent &&
+       cd "$TRASH_DIRECTORY" &&
+       rm -rf "$git" && mkdir "$git"
+'
+
+test_expect_success 'clone bare' '
+       "$GITP4" clone --dest="$git" --bare //depot &&
+       cd "$git" &&
+       test ! -d .git &&
+       bare=`git config --get core.bare` &&
+       test "$bare" = true &&
+       cd "$TRASH_DIRECTORY" &&
+       rm -rf "$git" && mkdir "$git"
+'
+
 test_expect_success 'shutdown' '
        pid=`pgrep -f p4d` &&
        test -n "$pid" &&