projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 1.3.0-rc2
[git.git]
/
git-fetch.sh
diff --git
a/git-fetch.sh
b/git-fetch.sh
index
de4f011
..
954901d
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.
# 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_= ;;
case "$remote_name_" in
HEAD)
note_= ;;
@@
-103,6
+106,9
@@
append_fetch_head () {
refs/tags/*)
note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
note_="tag '$note_' of " ;;
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
*)
note_="$remote_name of " ;;
esac
@@
-147,10
+153,10
@@
fast_forward_local () {
else
echo >&2 "* $1: storing $3"
fi
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)
# $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"
;;
*,$local)
echo >&2 "* $1: fast forward to $3"
+ echo >&2 " from $local to $2"
git-update-ref "$1" "$2" "$local"
;;
*)
git-update-ref "$1" "$2" "$local"
;;
*)
@@
-178,6
+185,7
@@
fast_forward_local () {
;;
*)
echo >&2 " not updating."
;;
*)
echo >&2 " not updating."
+ exit 1
;;
esac
}
;;
esac
}