mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix automerge message.

Browse Source 
The rewrite done while adding the shorthand support made the remote
refname recorded in the commit message too long for human consumption,
while losing information by using the shorthand not the real URL to
name the remote repository there.  They were both bad changes done
without enough thinking.

Pointed out by Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-02 02:34:13 -07:00
parent 89bc8c785e
commit 06ec2b4bb4
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
git-fetch-script
View File

@ -55,21 +55,41 @@ append_fetch_head () {
remote_nick_="$4" remote_nick_="$4"
local_name_="$5" 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. # 2.6.11-tree tag would not be happy to be fed to resolve.
if git-cat-file commit "$head_" >/dev/null 2>&1 if git-cat-file commit "$head_" >/dev/null 2>&1
then then
headc_=$(git-rev-parse --verify "$head_^0") || exit headc_=$(git-rev-parse --verify "$head_^0") || exit
note_="$headc_ $remote_name_ from $remote_nick_" echo "$headc_ $note_" >>$GIT_DIR/FETCH_HEAD
echo "$note_" >>$GIT_DIR/FETCH_HEAD echo >&2 "* committish: $head_"
echo >&2 "* committish: $note_" echo >&2 " $note_"
else else
echo >&2 "* non-commit: $note_" echo >&2 "* non-commit: $head_"
echo >&2 " $note_"
fi fi
if test "$local_name_" != "" if test "$local_name_" != ""
then then
# We are storing the head locally. Make sure that it is # We are storing the head locally. Make sure that it is
# a fast forward (aka "reverse push"). # a fast forward (aka "reverse push").
fast_forward_local "$local_name_" "$head_" "$remote_" "$remote_name_" fast_forward_local "$local_name_" "$head_" "$note_"
fi fi
} }
@ -80,11 +100,9 @@ fast_forward_local () {
# is no way to guarantee "fast-forward" anyway. # is no way to guarantee "fast-forward" anyway.
if test -f "$GIT_DIR/$1" if test -f "$GIT_DIR/$1"
then then
echo >&2 "* $1: updating with $4" echo >&2 "* $1: updating with $3"
echo >&2 " from $3."
else else
echo >&2 "* $1: storing $4" echo >&2 "* $1: storing $3"
echo >&2 " from $3."
fi fi
echo "$2" >"$GIT_DIR/$1" ;; echo "$2" >"$GIT_DIR/$1" ;;
@ -97,31 +115,28 @@ fast_forward_local () {
mb=$(git-merge-base "$local" "$2") && mb=$(git-merge-base "$local" "$2") &&
case "$2,$mb" in case "$2,$mb" in
$local,*) $local,*)
echo >&2 "* $1: same as $4" echo >&2 "* $1: same as $3"
echo >&2 " from $3"
;; ;;
*,$local) *,$local)
echo >&2 "* $1: fast forward to $4" echo >&2 "* $1: fast forward to $3"
echo >&2 " from $3"
;; ;;
*) *)
false false
;; ;;
esac || { esac || {
echo >&2 "* $1: does not fast forward to $4" echo >&2 "* $1: does not fast forward to $3;"
case "$force,$single_force" in case "$force,$single_force" in
t,* | *,t) t,* | *,t)
echo >&2 " from $3; forcing update." echo >&2 " forcing update."
;; ;;
*) *)
mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1.remote" 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 esac
} }
else else
echo >&2 "* $1: storing $4" echo >&2 "* $1: storing $3"
echo >&2 " from $3."
fi fi
test -f "$GIT_DIR/$1.lock" && test -f "$GIT_DIR/$1.lock" &&
mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1" mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1"