Re: Updating not actual branch

From: Konstantin Khomoutov <kostix+git@007spb.ru>
Date: Mar 12, 2013, 15:19 UTC
Message-ID: <20130312191936.d25cbca4934a8c92b7ec0542@domain007.com>
In-Reply-To: <006501ce1f24$94636a30$bd2a3e90$@certicon.cz>

On Tue, 12 Mar 2013 14:22:00 +0100 Jan Pešta <jan.pesta@certicon.cz> wrote:

Show 19 quoted lines

> I have a question if there is a posibility tu update a branch which
> is not actual working copy.
> 
> I have following situation:
> 
> A - B - C - I - J                       master
>                \ - D - E - F               feature 1
>                                  \ G - H     feature 2 (working copy)
> 
> I would like tu update whole tree with latest changes in master
> 
> A - B - C - I - J                                              master
>                            \ - D* - E* - F*                  feature 1
>                                                    \ G* - H*
> feature 2 (working copy)
> 
> 
> Is there some way how to do it without swithing to each branch and
> update them manually?

It's partially possible to do: you are able to forcibly fetch a remote object into any local branch provided it's not checked out. Hence, in your case you'll be able to update any branch excapt for "feature 2".

To do this, you could use the explicit refspec when fetching, like this:

$ git fetch origin +src1:dst1 '+blooper 1:feature 1'

(Consult the `git fetch` manual for more info on using refspecs.)

One possible downside is that I'm not sure this approach would play nicely with remote branches, if you have any. I mean, direct fetching into local branches will unlikely to update their matching "upstream" remote branches.

So supposedly a better way to go would be to write a script which would
go like this:
1) Do a simple one-argument `git fetch <remotename>` to fetch from
   the specified remote and update its remote branches.
2) Run `git for-each-ref`, and for each local branch found first check
   whether it's currently checked out (that is, HEAD points at it)
   and ignore the branch if it is; otherwise do `git update-ref`
   updating the branch pointer from its upstream branch -- referring to
   that using the <ref>@{upstream} syntax.
   (Consult the gitrevisions manual for more info on this syntax.)