[ooo-build-commit] .: autogen.sh download.in

[Miklos Vajna]

 autogen.sh  |    2 ++
 download.in |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 7f24ede9ec00fea0482abc74a131d41c5578a915
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Oct 6 00:26:12 2010 +0200

    autogen/download: prefer rebase instead of merge by default
    
    Let autogen/download set two configuration settings by default after each clone:
    
    1) git pull will be git pull -r by default (you can use git pull
       --no-rebase if you want the old behaviour) for the master branch
    2) the autosetup one is to have the same setting for every newly created
       branch
    
    NOTE: Having this in the download script means that this will have an
    effect only in newly cloned repos.

diff --git a/autogen.sh b/autogen.sh
index f818b09..7f5eda7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,3 +47,5 @@ if [ -d .git ] ; then
         fi
     done
 fi
+git config branch.master.rebase true
+git config branch.autosetuprebase always
diff --git a/download.in b/download.in
index 8d7e3b9..80676f4 100755
--- a/download.in
+++ b/download.in
@@ -279,6 +279,7 @@ sub source_file_ooo($)
                          ln -s \"../../../../git-hooks/\$file\" \"\$hook\"
                      fi
                  done" );
+        system( "cd @CLONEDIR@/$what ; git config branch.master.rebase true; git config branch.autosetuprebase always" );
     }
     elsif ( '@SOURCE_TYPE@' eq "UPSTREAM" ) {
         die "Up-stream doesn't have a package split" if ($SPLIT);