Also force LC_ALL in test scripts.

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 3c5d94b344b31d69b42bcb75d718dd23d01be542..4d8a572a9903179494c7cc4f8a72729a47f1c12b 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -65,8 +65,11 @@ get_remote_default_refs_for_push () {
        esac
 }
 
-# Subroutine to canonicalize remote:local notation
+# Subroutine to canonicalize remote:local notation.
 canon_refs_list_for_fetch () {
+       # Leave only the first one alone; add prefix . to the rest
+       # to prevent the secondary branches to be merged by default.
+       dot_prefix=
        for ref
        do
                force=
@@ -91,7 +94,8 @@ canon_refs_list_for_fetch () {
                heads/* | tags/* ) local="refs/$local" ;;
                *) local="refs/heads/$local" ;;
                esac
-               echo "${force}${remote}:${local}"
+               echo "${dot_prefix}${force}${remote}:${local}"
+               dot_prefix=.
        done
 }
 
@@ -107,6 +111,9 @@ get_remote_default_refs_for_fetch () {
                echo "refs/heads/${remote_branch}:refs/heads/$1"
                ;;
        remotes)
+               # This prefixes the second and later default refspecs
+               # with a '.', to signal git-fetch to mark them
+               # not-for-merge.
                canon_refs_list_for_fetch $(sed -ne '/^Pull: */{
                                                s///p
                                        }' "$GIT_DIR/remotes/$1")
@@ -153,3 +160,24 @@ get_remote_refs_for_fetch () {
            ;;
        esac
 }
+
+resolve_alternates () {
+       # original URL (xxx.git)
+       top_=`expr "$1" : '\([^:]*:/*[^/]*\)/'`
+       while read path
+       do
+               case "$path" in
+               \#* | '')
+                       continue ;;
+               /*)
+                       echo "$top_$path/" ;;
+               ../*)
+                       # relative -- ugly but seems to work.
+                       echo "$1/objects/$path/" ;;
+               *)
+                       # exit code may not be caught by the reader.
+                       echo "bad alternate: $path"
+                       exit 1 ;;
+               esac
+       done
+}