Henrik, I'll admit that I think of the build script more as a "get started, have all the pieces in place" kinda thing. And then assume that people will simply update the different packages as needed (which in most cases means "not very often").
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). 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. So can you explain a bit more why you suggest this change? /D On Sun, Jul 12, 2015 at 02:42:18PM +0200, [email protected] wrote: > From: Henrik Brautaset Aronsen <[email protected]> > > Without rebase, the build script would stop because it > couldn't complete a merge. > --- > scripts/build.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/scripts/build.sh b/scripts/build.sh > index 7b54bea..cb9b4ad 100755 > --- a/scripts/build.sh > +++ b/scripts/build.sh > @@ -77,7 +77,7 @@ if [ ! -d libgit2 ] ; then > fi > cd libgit2 > # let's build with a recent enough version of master for the latest features > -git pull origin master > +git pull --rebase origin master > if ! git checkout c11daac9de2 ; then > echo "Can't find the right commit in libgit2 - giving up" > exit 1 > @@ -110,7 +110,7 @@ if [ ! -d libdivecomputer ] ; then > fi > fi > cd libdivecomputer > -git pull > +git pull --rebase > if ! git checkout Subsurface-testing ; then > echo "can't check out the Subsurface-testing branch of libdivecomputer > -- giving up" > exit 1 > @@ -134,7 +134,7 @@ if [ ! -d marble-source ] ; then > fi > fi > cd marble-source > -git pull > +git pull --rebase > if ! git checkout Subsurface-testing ; then > echo "can't check out the Subsurface-testing branch of marble -- giving > up" > exit 1 > -- > 2.4.1 > > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
