diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-21 13:59:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-21 13:59:54 -0700 |
| commit | b91fb518cc5c5f316ba149ceedff5ee194f44ebf (patch) | |
| tree | 643ba0ef9be45e07bfa9be5f4b723351508239ca /git-fetch.sh | |
| parent | 4041483e5a3d2010e038ec686ef1638cde659f0b (diff) | |
| download | git-b91fb518cc5c5f316ba149ceedff5ee194f44ebf.tar.gz git-b91fb518cc5c5f316ba149ceedff5ee194f44ebf.tar.xz | |
Revert "Make Octopus merge message a bit nicer."
This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index cbfa27de9..822b4cd98 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -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 |