Merge branch 'js/diffstat' into next

diff --git a/git-fetch.sh b/git-fetch.sh
index de4f011e26c3d0b2012ff44692757ca0c9984f16..83143f82cfa3b92a38a9caa2b00860541d139aa2 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -94,6 +94,9 @@ append_fetch_head () {
     # remote-nick is the URL given on the command line (or a shorthand)
     # remote-name is the $GIT_DIR relative refs/ path we computed
     # for this refspec.
+
+    # the $note_ variable will be fed to git-fmt-merge-msg for further
+    # processing.
     case "$remote_name_" in
     HEAD)
        note_= ;;
@@ -103,10 +106,13 @@ append_fetch_head () {
     refs/tags/*)
        note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
        note_="tag '$note_' of " ;;
+    refs/remotes/*)
+       note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')"
+       note_="remote branch '$note_' of " ;;
     *)
        note_="$remote_name of " ;;
     esac
-    remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
+    remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') &&
        remote_="$remote_1_"
     note_="$note_$remote_"
 
@@ -147,10 +153,10 @@ fast_forward_local () {
        else
                echo >&2 "* $1: storing $3"
        fi
-       git-update-ref "$1" "$2" 
+       git-update-ref "$1" "$2"
        ;;
 
-    refs/heads/*)
+    refs/heads/* | refs/remotes/*)
        # $1 is the ref being updated.
        # $2 is the new value for the ref.
        local=$(git-rev-parse --verify "$1^0" 2>/dev/null)
@@ -164,6 +170,7 @@ fast_forward_local () {
                ;;
            *,$local)
                echo >&2 "* $1: fast forward to $3"
+               echo >&2 "  from $local to $2"
                git-update-ref "$1" "$2" "$local"
                ;;
            *)
@@ -178,6 +185,7 @@ fast_forward_local () {
                        ;;
                *)
                        echo >&2 "  not updating."
+                       exit 1
                        ;;
                esac
            }
@@ -237,22 +245,22 @@ fetch_main () {
 
       # These are relative path from $GIT_DIR, typically starting at refs/
       # but may be HEAD
-      if expr "$ref" : '\.' >/dev/null
+      if expr "z$ref" : 'z\.' >/dev/null
       then
          not_for_merge=t
-         ref=$(expr "$ref" : '\.\(.*\)')
+         ref=$(expr "z$ref" : 'z\.\(.*\)')
       else
          not_for_merge=
       fi
-      if expr "$ref" : '\+' >/dev/null
+      if expr "z$ref" : 'z+' >/dev/null
       then
          single_force=t
-         ref=$(expr "$ref" : '\+\(.*\)')
+         ref=$(expr "z$ref" : 'z+\(.*\)')
       else
          single_force=
       fi
-      remote_name=$(expr "$ref" : '\([^:]*\):')
-      local_name=$(expr "$ref" : '[^:]*:\(.*\)')
+      remote_name=$(expr "z$ref" : 'z\([^:]*\):')
+      local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
 
       rref="$rref$LF$remote_name"
 
@@ -268,7 +276,7 @@ fetch_main () {
              print "$u";
          ' "$remote_name")
          head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
-         expr "$head" : "$_x40\$" >/dev/null ||
+         expr "z$head" : "z$_x40\$" >/dev/null ||
                  die "Failed to fetch $remote_name from $remote"
          echo >&2 Fetching "$remote_name from $remote" using http
          git-http-fetch -v -a "$head" "$remote/" || exit
@@ -354,7 +362,7 @@ fetch_main () {
                  break ;;
              esac
          done
-         local_name=$(expr "$found" : '[^:]*:\(.*\)')
+         local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
          append_fetch_head "$sha1" "$remote" \
                  "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
       done