git-svnimport: Improved detection of merges.

diff --git a/git-fetch.sh b/git-fetch.sh
index 280f62e4b7e1fcdf97f306bab6044b5c383dce0d..69bd810082655a6ee7594e86a6e8e28e3e5a43e2 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -211,12 +211,12 @@ esac
 reflist=$(get_remote_refs_for_fetch "$@")
 if test "$tags"
 then
-       taglist=$(IFS=" " &&
+       taglist=`IFS="  " &&
                  git-ls-remote $upload_pack --tags "$remote" |
                  while read sha1 name
                  do
                        case "$name" in
-                       (*^*) continue ;;
+                       *^*) continue ;;
                        esac
                        if git-check-ref-format "$name"
                        then
@@ -224,7 +224,7 @@ then
                        else
                            echo >&2 "warning: tag ${name} ignored"
                        fi
-                 done)
+                 done`
        if test "$#" -gt 1
        then
                # remote URL plus explicit refspecs; we need to merge them.