summaryrefslogtreecommitdiff
path: root/git-fetch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-19 07:03:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-21 01:16:27 (GMT)
commit63f1aa6c72c46928f1b6959437aed4becbc42ff3 (patch)
treedcea0f1c834747eb6756b35fbe43e9bb5c6b3f1d /git-fetch.sh
parentf887564ab72e107bcdee3ba83c91e2bb4ae13ca7 (diff)
downloadgit-63f1aa6c72c46928f1b6959437aed4becbc42ff3.zip
git-63f1aa6c72c46928f1b6959437aed4becbc42ff3.tar.gz
git-63f1aa6c72c46928f1b6959437aed4becbc42ff3.tar.bz2
Make Octopus merge message a bit nicer.
Linus says that 'of .' to mean the commits came from the local repository was too confusing and ugly -- I tend to agree with him. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-xgit-fetch.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index 822b4cd..cbfa27d 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -58,21 +58,25 @@ 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_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
+ remote_="$remote_1_"
+ case "$remote_" in
+ . | ./) where_= ;;
+ *) where_=" of $remote_" ;;
+ esac
case "$remote_name_" in
HEAD)
note_= ;;
refs/heads/*)
note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
- note_="branch '$note_' of " ;;
+ note_="branch '$note_'" ;;
refs/tags/*)
note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
- note_="tag '$note_' of " ;;
+ note_="tag '$note_'" ;;
*)
- note_="$remote_name of " ;;
+ note_="$remote_name" ;;
esac
- remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
- remote_="$remote_1_"
- note_="$note_$remote_"
+ note_="$note_$where_"
# 2.6.11-tree tag would not be happy to be fed to resolve.
if git-cat-file commit "$head_" >/dev/null 2>&1