[PATCH] Possible cleanups for local-pull.c

[git.git] / git-fetch-script

diff --git a/git-fetch-script b/git-fetch-script
index b581dc4..f9f90b6 100755 (executable)
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -7,28 +7,33 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 
 append=
 force=
+update_head_ok=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
        -a|--a|--ap|--app|--appe|--appen|--append)
                append=t
-               shift
                ;;
        -f|--f|--fo|--for|--forc|--force)
                force=t
-               shift
+               ;;
+       -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\
+       --update-he|--update-hea|--update-head|--update-head-|\
+       --update-head-o|--update-head-ok)
+               update_head_ok=t
                ;;
        *)
                break
                ;;
        esac
+       shift
 done
 
 case "$#" in
 0)
        test -f "$GIT_DIR/branches/origin" ||
                test -f "$GIT_DIR/remotes/origin" ||
-                       die "Where do you want to fetch from?"
+                       die "Where do you want to fetch from today?"
        set origin ;;
 esac
 
@@ -50,21 +55,41 @@ append_fetch_head () {
     remote_nick_="$4"
     local_name_="$5"
 
+    # 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.
+    case "$remote_name_" in
+    HEAD)
+       note_= ;;
+    refs/heads/*)
+       note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
+       note_="branch '$note_' of " ;;
+    refs/tags/*)
+       note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
+       note_="tag '$note_' of " ;;
+    *)
+       note_="$remote_name of " ;;
+    esac
+    remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
+       remote_="$remote_1_"
+    note_="$note_$remote_"
+
     # 2.6.11-tree tag would not be happy to be fed to resolve.
     if git-cat-file commit "$head_" >/dev/null 2>&1
     then
        headc_=$(git-rev-parse --verify "$head_^0") || exit
-       note_="$headc_  $remote_name_ from $remote_nick_"
-       echo "$note_" >>$GIT_DIR/FETCH_HEAD
-       echo >&2 "* committish: $note_"
+       echo "$headc_   $note_" >>$GIT_DIR/FETCH_HEAD
+       echo >&2 "* committish: $head_"
+       echo >&2 "  $note_"
     else
-       echo >&2 "* non-commit: $note_"
+       echo >&2 "* non-commit: $head_"
+       echo >&2 "  $note_"
     fi
     if test "$local_name_" != ""
     then
        # We are storing the head locally.  Make sure that it is
        # a fast forward (aka "reverse push").
-       fast_forward_local "$local_name_" "$head_" "$remote_" "$remote_name_"
+       fast_forward_local "$local_name_" "$head_" "$note_"
     fi
 }
 
@@ -75,11 +100,9 @@ fast_forward_local () {
        # is no way to guarantee "fast-forward" anyway.
        if test -f "$GIT_DIR/$1"
        then
-               echo >&2 "* $1: updating with $4"
-               echo >&2 "  from $3."
+               echo >&2 "* $1: updating with $3"
        else
-               echo >&2 "* $1: storing $4"
-               echo >&2 "  from $3."
+               echo >&2 "* $1: storing $3"
        fi
        echo "$2" >"$GIT_DIR/$1" ;;
 
@@ -92,31 +115,28 @@ fast_forward_local () {
            mb=$(git-merge-base "$local" "$2") &&
            case "$2,$mb" in
            $local,*)
-               echo >&2 "* $1: same as $4"
-               echo >&2 "  from $3"
+               echo >&2 "* $1: same as $3"
                ;;
            *,$local)
-               echo >&2 "* $1: fast forward to $4"
-               echo >&2 "  from $3"
+               echo >&2 "* $1: fast forward to $3"
                ;;
            *)
                false
                ;;
            esac || {
-               echo >&2 "* $1: does not fast forward to $4"
+               echo >&2 "* $1: does not fast forward to $3;"
                case "$force,$single_force" in
                t,* | *,t)
-                       echo >&2 "  from $3; forcing update."
+                       echo >&2 "  forcing update."
                        ;;
                *)
                        mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1.remote"
-                       echo >&2 "  from $3; leaving it in '$1.remote'"
+                       echo >&2 "  leaving it in '$1.remote'"
                        ;;
                esac
            }
        else
-               echo >&2 "* $1: storing $4"
-               echo >&2 "  from $3."
+               echo >&2 "* $1: storing $3"
        fi
        test -f "$GIT_DIR/$1.lock" &&
            mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1"
@@ -124,6 +144,12 @@ fast_forward_local () {
     esac
 }
 
+case "$update_head_ok" in
+'')
+       orig_head=$(cat "$GIT_DIR/HEAD" 2>/dev/null)
+       ;;
+esac
+
 for ref in $(get_remote_refs_for_fetch "$@")
 do
     refs="$refs $ref"
@@ -150,7 +176,7 @@ do
        fi
        head=$(curl -nsf $curl_extra_args "$remote/$remote_name") &&
        expr "$head" : "$_x40\$" >/dev/null ||
-           die "Failed to fetch $remote_name from $remote"
+               die "Failed to fetch $remote_name from $remote"
        echo Fetching "$remote_name from $remote" using http
        git-http-pull -v -a "$head" "$remote/" || exit
        ;;
@@ -201,3 +227,18 @@ http://* | https://* | rsync://* )
     done
     ;;
 esac
+
+# If the original head was empty (i.e. no "master" yet), or
+# if we were told not to worry, we do not have to check.
+case ",$update_head_ok,$orig_head," in
+*,, | t,* )
+       ;;
+*)
+       curr_head=$(cat "$GIT_DIR/HEAD" 2>/dev/null)
+       if test "$curr_head" != "$orig_head"
+       then
+               echo "$orig_head" >$GIT_DIR/HEAD
+               die "Cannot fetch into the current branch."
+       fi
+       ;;
+esac