git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Gelonida N <gelonida@gmail.com>,
	git@vger.kernel.org, Sitaram Chamarty <sitaramc@gmail.com>
Subject: Re: best way to fastforward all tracking branches after a fetch
Date: Sun, 11 Dec 2011 20:53:05 +0100	[thread overview]
Message-ID: <201112112053.07548.jnareb@gmail.com> (raw)
In-Reply-To: <m2hb176iiy.fsf@igel.home>

Andreas Schwab wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
> 
> > Something like
> >
> >   git for-each-ref '--format=%(refname) %(upstream)' |
> >   while read refname upstream
> >   do
> >   	# there is upstream
> >   	test -n "$upstream" || break

Here you should probably also check if we are already up-to-date:

    	test $(git rev-parse $upstream) = $(git rev-parse $refname) || continue

> >   	# and if fast-forwards
> >   	test $(git merge-base $refname $upstream) = $(git rev-parse $refname) || break
> >   	git update-ref -m "$message" $refname $upstream
> >   done
> 
> You probably meant s/break/continue/.

Yes, sorry about that.

BTW. git-update-ref invocation can be replaced by Sitaram's suggestion:

    	git branch -f $refname $upstream

-- 
Jakub Narebski
Poland

  reply	other threads:[~2011-12-11 19:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-10 12:26 best way to fastforward all tracking branches after a fetch Gelonida N
2011-12-11  2:22 ` Sitaram Chamarty
2011-12-11 16:17   ` Gelonida N
2011-12-11 18:22     ` Jakub Narebski
2011-12-11 18:56       ` Sitaram Chamarty
2011-12-11 19:00       ` Andreas Schwab
2011-12-11 19:53         ` Jakub Narebski [this message]
2011-12-11 19:58       ` Gelonida N
2011-12-11 20:30         ` Andreas Schwab
2011-12-11 16:27 ` Martin Langhoff
2011-12-11 20:14 ` Stefan Haller
2011-12-11 20:27   ` Gelonida N
2011-12-11 20:43     ` Martin Langhoff
2011-12-11 22:22   ` Hallvard B Furuseth
2011-12-12  7:33     ` Stefan Haller
2011-12-12  8:25       ` Jeff King
2011-12-12  9:19         ` Stefan Haller
2011-12-13 19:05       ` Hallvard Breien Furuseth
2011-12-12  8:28     ` Junio C Hamano
2011-12-12  8:09 ` Junio C Hamano
2011-12-12 10:13   ` Gelonida N
2011-12-12 10:24     ` Gelonida N
2011-12-17 10:10 ` Sitaram Chamarty
2011-12-17 10:11   ` Sitaram Chamarty
2011-12-19  6:31     ` Nazri Ramliy
2012-01-18  1:50       ` Sitaram Chamarty
2012-01-18  1:48   ` Sitaram Chamarty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201112112053.07548.jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=gelonida@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=schwab@linux-m68k.org \
    --cc=sitaramc@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).