diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-03-10 04:19:07 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-03-10 22:31:20 -0800 |
| commit | 687b8be8bb75b97e917dc744f91890270913041d (patch) | |
| tree | a280395be4505a1691d898c1a57ee990f2641fb8 /git-fetch.sh | |
| parent | Add git-imap-send, derived from isync 1.0.1. (diff) | |
| download | tgif-687b8be8bb75b97e917dc744f91890270913041d.tar.xz | |
fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
We can now easily fetch and merge things from heads in the
refs/remotes/ hierarchy in remote repositories.
The refs/remotes/ hierarchy is likely to become the standard for
tracking foreign SCMs, as well as the location of Pull: targets
for tracking remote branches in newly cloned repositories.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 0346d4a45c..c0eb96752e 100755 --- 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. + + # the $note_ variable will be fed to git-fmt-merge-msg for further + # processing. 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/remotes/*) + note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')" + note_="remote branch '$note_' of " ;; *) note_="$remote_name of " ;; esac @@ -147,10 +153,10 @@ fast_forward_local () { 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) |