1#!/bin/sh 2# 3# Copyright (c) 2005 Junio C Hamano 4# 5# Fetch one or more remote refs and merge it/them into the current HEAD. 6 7USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...' 8LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' 9SUBDIRECTORY_OK=Yes 10OPTIONS_SPEC= 11. git-sh-setup 12set_reflog_action "pull $*" 13require_work_tree 14cd_to_toplevel 15 16test -z"$(git ls-files -u)"|| 17 die "You are in the middle of a conflicted merge." 18 19strategy_args= diffstat= no_commit= squash= no_ff= log_arg= verbosity= 20curr_branch=$(git symbolic-ref -q HEAD) 21curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||") 22rebase=$(git config --bool branch.$curr_branch_short.rebase) 23while: 24do 25case"$1"in 26-q|--quiet) 27 verbosity="$verbosity-q";; 28-v|--verbose) 29 verbosity="$verbosity-v";; 30-n|--no-stat|--no-summary) 31 diffstat=--no-stat;; 32--stat|--summary) 33 diffstat=--stat;; 34--log|--no-log) 35 log_arg=$1;; 36--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) 37 no_commit=--no-commit;; 38--c|--co|--com|--comm|--commi|--commit) 39 no_commit=--commit;; 40--sq|--squ|--squa|--squas|--squash) 41 squash=--squash;; 42--no-sq|--no-squ|--no-squa|--no-squas|--no-squash) 43 squash=--no-squash;; 44--ff) 45 no_ff=--ff;; 46--no-ff) 47 no_ff=--no-ff;; 48-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ 49--strateg=*|--strategy=*|\ 50-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) 51case"$#,$1"in 52*,*=*) 53 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'`;; 541,*) 55 usage ;; 56*) 57 strategy="$2" 58shift;; 59esac 60 strategy_args="${strategy_args}-s$strategy" 61;; 62-r|--r|--re|--reb|--reba|--rebas|--rebase) 63 rebase=true 64;; 65--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase) 66 rebase=false 67;; 68-h|--h|--he|--hel|--help) 69 usage 70;; 71*) 72# Pass thru anything that may be meant for fetch. 73break 74;; 75esac 76shift 77done 78 79error_on_no_merge_candidates () { 80exec>&2 81for opt 82do 83case"$opt"in 84-t|--t|--ta|--tag|--tags) 85echo"Fetching tags only, you probably meant:" 86echo" git fetch --tags" 87exit1 88esac 89done 90 91iftest true ="$rebase" 92then 93 op_type=rebase 94 op_prep=against 95else 96 op_type=merge 97 op_prep=with 98fi 99 100 curr_branch=${curr_branch#refs/heads/} 101 upstream=$(git config "branch.$curr_branch.merge") 102 remote=$(git config "branch.$curr_branch.remote") 103 104if[$#-gt1];then 105if["$rebase"= true ];then 106printf"There is no candidate for rebasing against " 107else 108printf"There are no candidates for merging " 109fi 110echo"among the refs that you just fetched." 111echo"Generally this means that you provided a wildcard refspec which had no" 112echo"matches on the remote end." 113elif[$#-gt0] && ["$1"!="$remote"];then 114echo"You asked to pull from the remote '$1', but did not specify" 115echo"a branch. Because this is not the default configured remote" 116echo"for your current branch, you must specify a branch on the command line." 117elif[-z"$curr_branch"];then 118echo"You are not currently on a branch, so I cannot use any" 119echo"'branch.<branchname>.merge' in your configuration file." 120echo"Please specify which remote branch you want to use on the command" 121echo"line and try again (e.g. 'git pull <repository> <refspec>')." 122echo"See git-pull(1) for details." 123elif[-z"$upstream"];then 124echo"You asked me to pull without telling me which branch you" 125echo"want to$op_type$op_prep, and 'branch.${curr_branch}.merge' in" 126echo"your configuration file does not tell me, either. Please" 127echo"specify which branch you want to use on the command line and" 128echo"try again (e.g. 'git pull <repository> <refspec>')." 129echo"See git-pull(1) for details." 130echo 131echo"If you often$op_type$op_prepthe same branch, you may want to" 132echo"use something like the following in your configuration file:" 133echo 134echo" [branch\"${curr_branch}\"]" 135echo" remote = <nickname>" 136echo" merge = <remote-ref>" 137test rebase ="$op_type"&& 138echo" rebase = true" 139echo 140echo" [remote\"<nickname>\"]" 141echo" url = <url>" 142echo" fetch = <refspec>" 143echo 144echo"See git-config(1) for details." 145else 146echo"Your configuration specifies to$op_type$op_prepthe ref '${upstream#refs/heads/}'" 147echo"from the remote, but no such ref was fetched." 148fi 149exit1 150} 151 152test true ="$rebase"&& { 153if! git rev-parse -q --verify HEAD >/dev/null 154then 155# On an unborn branch 156iftest -f"$GIT_DIR/index" 157then 158 die "updating an unborn branch with changes added to the index" 159fi 160else 161 git update-index --ignore-submodules --refresh&& 162 git diff-files --ignore-submodules --quiet&& 163 git diff-index --ignore-submodules --cached --quiet HEAD --|| 164 die "refusing to pull with rebase: your working tree is not up-to-date" 165fi 166 oldremoteref= && 167 . git-parse-remote&& 168 remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)"&& 169 oldremoteref="$(git rev-parse -q --verify "$remoteref")"&& 170for reflog in$(git rev-list -g $remoteref 2>/dev/null) 171do 172iftest"$reflog"="$(git merge-base $reflog $curr_branch)" 173then 174 oldremoteref="$reflog" 175break 176fi 177done 178} 179orig_head=$(git rev-parse -q --verify HEAD) 180git fetch $verbosity--update-head-ok"$@"||exit1 181 182curr_head=$(git rev-parse -q --verify HEAD) 183iftest -n"$orig_head"&&test"$curr_head"!="$orig_head" 184then 185# The fetch involved updating the current branch. 186 187# The working tree and the index file is still based on the 188# $orig_head commit, but we are merging into $curr_head. 189# First update the working tree to match $curr_head. 190 191echo>&2"Warning: fetch updated the current branch head." 192echo>&2"Warning: fast forwarding your working tree from" 193echo>&2"Warning: commit$orig_head." 194 git update-index -q --refresh 195 git read-tree -u -m"$orig_head""$curr_head"|| 196 die 'Cannot fast-forward your working tree. 197After making sure that you saved anything precious from 198$ git diff '$orig_head' 199output, run 200$ git reset --hard 201to recover.' 202 203fi 204 205merge_head=$(sed-e'/ not-for-merge /d' \ 206-e's/ .*//'"$GIT_DIR"/FETCH_HEAD | \ 207tr'\012'' ') 208 209case"$merge_head"in 210'') 211 error_on_no_merge_candidates "$@" 212;; 213?*' '?*) 214iftest -z"$orig_head" 215then 216 die "Cannot merge multiple branches into empty head" 217fi 218iftest true ="$rebase" 219then 220 die "Cannot rebase onto multiple branches" 221fi 222;; 223esac 224 225iftest -z"$orig_head" 226then 227 git update-ref -m"initial pull" HEAD $merge_head"$curr_head"&& 228 git read-tree --reset -u HEAD ||exit1 229exit 230fi 231 232merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD")||exit 233test true ="$rebase"&& 234exec git-rebase$diffstat $strategy_args--onto$merge_head \ 235${oldremoteref:-$merge_head} 236exec git-merge$diffstat $no_commit $squash $no_ff $log_arg $strategy_args \ 237"$merge_name" HEAD $merge_head $verbosity