From 533bebcc4241ddfdfde8794bcf76bdf028fa7f90 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Oct 2008 16:33:19 +0000
Subject: [PATCH] Added a --force flag to guarantee a successful pull.

---
 make.sh              | 2 ++
 tools/make-functions | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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