From: Teemu Likonen Date: Wed, 24 Feb 2010 19:07:08 GMT Subject: Re: [PATCH 3/3] fetch --all/--multiple: keep all the fetched branch information Message-ID: <87y6iizc4j.fsf@mithlond.arda> In-Reply-To: <7vpr3uqwya.fsf_-_@alter.siamese.dyndns.org> * 2010-02-24 11:02 (-0800), Junio C. Hamano wrote: > Since "git fetch" learned "--all" and "--multiple" options, it has become > tempting for users to say "git pull --all". Even though it may fetch from > remotes that do not need to be fetched from for merging with the current > branch, it is handy. > > "git fetch" however clears the list of fetched branches every time it > contacts a different remote. Unless the current branch is configured to > merge with a branch from a remote that happens to be the last in the list > of remotes that are contacted, "git pull" that fetches from multiple > remotes will not be able to find the branch it should be merging with. > > Make "fetch" clear FETCH_HEAD (unless --append is given) and then append > the list of branches fetched to it (even when --apend is not given). That ^^^^^^^ Not very important but there's a typo: "apend". > way, "pull" will be able to find the data for the branch being merged in > FETCH_HEAD no matter where the remote appears in the list of remotes to be > contacted by "git fetch". > > Reported-by: Michael Lukashov > Signed-off-by: Junio C Hamano