[PATCH] Use git pull with rebase in build script

Dirk Hohndel dirk at hohndel.org
Sun Jul 12 07:05:42 PDT 2015

On Sun, Jul 12, 2015 at 03:51:39PM +0200, Henrik Brautaset Aronsen wrote:
> > On 12 Jul 2015, at 15:45, Dirk Hohndel <dirk at hohndel.org> wrote:
> > 
> > Why would you need -rebase for the libgit2 repository, unless you have
> > local changes (and I just realize that I need to patch the build script to
> > use a later commit there, anyway, as that one still doesn't work with
> > proxies).
> OK, maybe the rebase in libgit is a bit too eager.


> > And since I frequently force push into the Subsurface-testing
> > branches of libdc and marble, I'm not sure what benefit -rebase gives you
> > there. You usually need to remove those directories and check out fresh
> > copies for things to be in a consistent state.
> Rebase can actually cope with a force push automatically.  It’s pretty
> awesome, as some would say.  On several occations when the build fails,
> it’s in the middle of a merge in either libdc or (recently) marble.
> Then I just go to the project in question,  abort the merge, and do a
> git pull —rebase.  Voila, build.sh can continue.  By adding this to the
> script I don’t have to intervene manually.

Thanks for the explanation, Henrik. I read a bit through the git-rebase
manpage and that has not necessarily completely enlightened me on the
wisdom of this changes.

Linus, this sounds nice... you obviously understand the inner workings
here much better. Is this a reasonable thing to do? Or will it cause
pregnant kittens?

I like adding things that make it easier for our developers to stay


More information about the subsurface mailing list