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

Revert "Make Octopus merge message a bit nicer."

Browse Source 
This reverts 63f1aa6c72 commit.
This commit is contained in:
Junio C Hamano
2005-09-21 13:59:54 -07:00
parent 4041483e5a
commit b91fb518cc
2 changed files with 11 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-fetch.sh
View File

@ -58,25 +58,21 @@ 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_'" ;;
note_="branch '$note_' of " ;;
refs/tags/*)
note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
note_="tag '$note_'" ;;
note_="tag '$note_' of " ;;
*)
note_="$remote_name" ;;
note_="$remote_name of " ;;
esac
note_="$note_$where_"
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