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

Make Octopus merge message a bit nicer.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-09-19 00:03:47 -07:00
parent f887564ab7
commit 63f1aa6c72
2 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-fetch.sh
View File

@ -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