git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 8ea5c5e816c067db88f04bc5a0613ca1dbb13456..b7e5d0458470248e65da0893b8b9bb4ced9152da 100755 (executable)
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -58,7 +58,7 @@ http://* | https://* | ftp://* )
             curl_extra_args="-k"
         fi
        if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
-               "`git-config --bool http.noEPSV`" = true ]; then
+               "`git config --bool http.noEPSV`" = true ]; then
                curl_extra_args="${curl_extra_args} --disable-epsv"
        fi
        curl -nsf $curl_extra_args --header "Pragma: no-cache" "$peek_repo/info/refs" ||
@@ -82,15 +82,20 @@ rsync://* )
        (cd $tmpdir && find refs -type f) |
        while read path
        do
-               cat "$tmpdir/$path" | tr -d '\012'
+               tr -d '\012' <"$tmpdir/$path"
                echo "  $path"
        done &&
        rm -fr $tmpdir
        ;;
 
 * )
-       git-peek-remote $exec "$peek_repo" ||
+       if test -f "$peek_repo" ; then
+               git bundle list-heads "$peek_repo" ||
                echo "failed    slurping"
+       else
+               git-peek-remote $exec "$peek_repo" ||
+               echo "failed    slurping"
+       fi
        ;;
 esac |
 sort -t '      ' -k 2 |