Added a --force flag to guarantee a successful pull.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Oct 2008 16:33:19 +0000 (16:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Oct 2008 16:33:19 +0000 (16:33 +0000)
make.sh
tools/make-functions

diff --git a/make.sh b/make.sh
index 3307e9e..d6e235a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -905,6 +905,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)
                        git pull
                ;;
          commit|ci)
index 9eb7219..a357d06 100644 (file)
@@ -496,7 +496,7 @@ batch_script() {
                $0 clean
                evaluate 1
 
                $0 clean
                evaluate 1
 
-               $0 git update
+               $0 git update --force
                evaluate 1 mail_me UPDATE
 
                echo "### EXPORT SOURCES"
                evaluate 1 mail_me UPDATE
 
                echo "### EXPORT SOURCES"