From: Junio C Hamano <junkio@cox.net>
Date: Sat, 25 Nov 2006 09:04:54 +0000 (-0800)
Subject: Merge branch 'master' into jc/globfetch
X-Git-Tag: v1.5.0-rc0~181^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cadd8a7d4dad0a29a9b38b33979e7137adaf62cf?ds=inline;hp=-c

Merge branch 'master' into jc/globfetch

This is to pick up the fix made on master:

git-fetch: exit with non-zero status when fast-forward check fails
---

cadd8a7d4dad0a29a9b38b33979e7137adaf62cf
diff --combined git-fetch.sh
index 06b66b968d,4425562098..4eecf148ea
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@@ -88,10 -88,6 +88,10 @@@ the
  	: >"$GIT_DIR/FETCH_HEAD"
  fi
  
 +# Global that is reused later
 +ls_remote_result=$(git ls-remote $upload_pack "$remote") ||
 +	die "Cannot find the reflist at $remote"
 +
  append_fetch_head () {
      head_="$1"
      remote_="$2"
@@@ -237,7 -233,10 +237,7 @@@ reflist=$(get_remote_refs_for_fetch "$@
  if test "$tags"
  then
  	taglist=`IFS="	" &&
 -		  (
 -			git-ls-remote $upload_pack --tags "$remote" ||
 -			echo fail ouch
 -		  ) |
 +		  echo "$ls_remote_result" |
  	          while read sha1 name
  		  do
  			case "$sha1" in
@@@ -246,8 -245,6 +246,8 @@@
  			esac
  			case "$name" in
  			*^*) continue ;;
 +			refs/tags/*) ;;
 +			*) continue ;;
  			esac
  		  	if git-check-ref-format "$name"
  			then
@@@ -307,20 -304,22 +307,20 @@@ fetch_main () 
  		"`git-repo-config --bool http.noEPSV`" = true ]; then
  	      noepsv_opt="--disable-epsv"
  	  fi
 -	  max_depth=5
 -	  depth=0
 -	  head="ref: $remote_name"
 -	  while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null
 -	  do
 -	    remote_name_quoted=$(@@PERL@@ -e '
 -	      my $u = $ARGV[0];
 -              $u =~ s/^ref:\s*//;
 -	      $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
 -	      print "$u";
 -	  ' "$head")
 -	    head=$(curl -nsfL $curl_extra_args $noepsv_opt "$remote/$remote_name_quoted")
 -	    depth=$( expr \( $depth + 1 \) )
 -	  done
 +
 +	  # Find $remote_name from ls-remote output.
 +	  head=$(
 +		IFS='	'
 +		echo "$ls_remote_result" |
 +		while read sha1 name
 +		do
 +			test "z$name" = "z$remote_name" || continue
 +			echo "$sha1"
 +			break
 +		done
 +	  )
  	  expr "z$head" : "z$_x40\$" >/dev/null ||
 -	      die "Failed to fetch $remote_name from $remote"
 +		die "No such ref $remote_name at $remote"
  	  echo >&2 "Fetching $remote_name from $remote using $proto"
  	  git-http-fetch -v -a "$head" "$remote/" || exit
  	  ;;
@@@ -360,7 -359,7 +360,7 @@@
        esac
  
        append_fetch_head "$head" "$remote" \
- 	  "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
+ 	  "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" || exit
  
    done
  
@@@ -414,15 -413,16 +414,16 @@@
  	  done
  	  local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
  	  append_fetch_head "$sha1" "$remote" \
- 		  "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
-       done
+ 		  "$remote_name" "$remote_nick" "$local_name" \
+ 		  "$not_for_merge" || exit
+       done &&
        if [ "$pack_lockfile" ]; then rm -f "$pack_lockfile"; fi
      ) || exit ;;
    esac
  
  }
  
- fetch_main "$reflist"
+ fetch_main "$reflist" || exit
  
  # automated tag following
  case "$no_tags$tags" in
@@@ -432,7 -432,7 +433,7 @@@
  		# effective only when we are following remote branch
  		# using local tracking branch.
  		taglist=$(IFS=" " &&
 -		git-ls-remote $upload_pack --tags "$remote" |
 +		echo "$ls_remote_result" |
  		sed -n	-e 's|^\('"$_x40"'\)	\(refs/tags/.*\)^{}$|\1 \2|p' \
  			-e 's|^\('"$_x40"'\)	\(refs/tags/.*\)$|\1 \2|p' |
  		while read sha1 name
@@@ -450,7 -450,7 +451,7 @@@
  	case "$taglist" in
  	'') ;;
  	?*)
- 		fetch_main "$taglist" ;;
+ 		fetch_main "$taglist" || exit ;;
  	esac
  esac