X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-fetch.sh;h=c3a200120df636fe8db0f02902d92c351c6c5e2e;hb=1c911dc86cd8c504fbad98a75b28cbc92317a0e8;hp=6d3a3468b3f22d8eeb1a2ba568a6c8ed48606dbd;hpb=b941ffac506d3f57246e46a8913da614e62a1d48;p=git.git

diff --git a/git-fetch.sh b/git-fetch.sh
index 6d3a3468b..c3a200120 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -117,20 +117,20 @@ append_fetch_head () {
 	test -n "$verbose" && flags="$flags$LF-v"
 	test -n "$force$single_force" && flags="$flags$LF-f"
 	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
-		git-fetch--tool $flags append-fetch-head "$@"
+		git fetch--tool $flags append-fetch-head "$@"
 }
 
 # updating the current HEAD with git-fetch in a bare
 # repository is always fine.
 if test -z "$update_head_ok" && test $(is_bare_repository) = false
 then
-	orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
+	orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
 fi
 
 # Allow --notags from remote.$1.tagopt
 case "$tags$no_tags" in
 '')
-	case "$(git-config --get "remote.$1.tagopt")" in
+	case "$(git config --get "remote.$1.tagopt")" in
 	--no-tags)
 		no_tags=t ;;
 	esac
@@ -146,7 +146,7 @@ if test "$tags"
 then
 	taglist=`IFS='	' &&
 		  echo "$ls_remote_result" |
-		  git-show-ref --exclude-existing=refs/tags/ |
+		  git show-ref --exclude-existing=refs/tags/ |
 	          while read sha1 name
 		  do
 			echo ".${name}:${name}"
@@ -163,18 +163,18 @@ fi
 
 fetch_all_at_once () {
 
-  eval=$(echo "$1" | git-fetch--tool parse-reflist "-")
+  eval=$(echo "$1" | git fetch--tool parse-reflist "-")
   eval "$eval"
 
     ( : subshell because we muck with IFS
       IFS=" 	$LF"
       (
 	if test "$remote" = . ; then
-	    git-show-ref $rref || echo failed "$remote"
+	    git show-ref $rref || echo failed "$remote"
 	elif test -f "$remote" ; then
 	    test -n "$shallow_depth" &&
 		die "shallow clone with bundle is not supported"
-	    git-bundle unbundle "$remote" $rref ||
+	    git bundle unbundle "$remote" $rref ||
 	    echo failed "$remote"
 	else
 		if	test -d "$remote" &&
@@ -190,16 +190,16 @@ fetch_all_at_once () {
 			# connected to our repository's tips, in which
 			# case we do not have to do any fetch.
 			theirs=$(echo "$ls_remote_result" | \
-				git-fetch--tool -s pick-rref "$rref" "-") &&
+				git fetch--tool -s pick-rref "$rref" "-") &&
 
 			# This will barf when $theirs reach an object that
 			# we do not have in our repository.  Otherwise,
 			# we already have everything the fetch would bring in.
-			git-rev-list --objects $theirs --not --all \
+			git rev-list --objects $theirs --not --all \
 				>/dev/null 2>/dev/null
 		then
 			echo "$ls_remote_result" | \
-				git-fetch--tool pick-rref "$rref" "-"
+				git fetch--tool pick-rref "$rref" "-"
 		else
 			flags=
 			case $verbose in
@@ -218,7 +218,7 @@ fetch_all_at_once () {
 	test -n "$verbose" && flags="$flags -v"
 	test -n "$force" && flags="$flags -f"
 	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
-		git-fetch--tool $flags native-store \
+		git fetch--tool $flags native-store \
 			"$remote" "$remote_nick" "$refs"
       )
     ) || exit
@@ -265,13 +265,13 @@ fetch_per_ref () {
 	      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
 	      noepsv_opt="--disable-epsv"
 	  fi
 
 	  # Find $remote_name from ls-remote output.
 	  head=$(echo "$ls_remote_result" | \
-		git-fetch--tool -s pick-rref "$remote_name" "-")
+		git fetch--tool -s pick-rref "$remote_name" "-")
 	  expr "z$head" : "z$_x40\$" >/dev/null ||
 		die "No such ref $remote_name at $remote"
 	  echo >&2 "Fetching $remote_name from $remote using $proto"
@@ -283,7 +283,7 @@ fetch_per_ref () {
 		die "shallow clone with rsync not supported"
 	  TMP_HEAD="$GIT_DIR/TMP_HEAD"
 	  rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
-	  head=$(git-rev-parse --verify TMP_HEAD)
+	  head=$(git rev-parse --verify TMP_HEAD)
 	  rm -f "$TMP_HEAD"
 	  case "$quiet" in '') v=-v ;; *) v= ;; esac
 	  test "$rsync_slurped_objects" || {
@@ -342,10 +342,10 @@ case "$no_tags$tags" in
 		# using local tracking branch.
 		taglist=$(IFS='	' &&
 		echo "$ls_remote_result" |
-		git-show-ref --exclude-existing=refs/tags/ |
+		git show-ref --exclude-existing=refs/tags/ |
 		while read sha1 name
 		do
-			git-cat-file -t "$sha1" >/dev/null 2>&1 || continue
+			git cat-file -t "$sha1" >/dev/null 2>&1 || continue
 			echo >&2 "Auto-following $name"
 			echo ".${name}:${name}"
 		done)
@@ -365,10 +365,10 @@ case "$orig_head" in
 '')
 	;;
 ?*)
-	curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
+	curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
 	if test "$curr_head" != "$orig_head"
 	then
-	    git-update-ref \
+	    git update-ref \
 			-m "$GIT_REFLOG_ACTION: Undoing incorrectly fetched HEAD." \
 			HEAD "$orig_head"
 		die "Cannot fetch into the current branch."