Simplify the script by removing the force checkout option

From now, we use git stash to remove all diff and then a rebase.

Author: mscherer

files/build_deploy.py

@@ -184,11 +184,9 @@ def notify_error(stage, error):
 syslog.syslog("Start the build of {}".format(name))
 
 os.chdir(checkout_dir)
-if config.get('force_checkout', False):
-    subprocess.call(['git', 'fetch'])
-    subprocess.call(['git', 'checkout', '-f', 'origin/master'])
-else:
-    subprocess.call(['git', 'pull', '--rebase'])
+subprocess.call(['git', 'stash'])
+subprocess.call(['git', 'stash', 'clear'])
+subprocess.call(['git', 'pull', '--rebase'])
 
 if has_submodules(checkout_dir):
     subprocess.call(['git', 'submodule', 'init'])

templates/builder.yml

@@ -19,4 +19,3 @@ notification:
 remote: {{ rsync_url }}
 # in hours
 regular_rebuild_interval: 6
-force_checkout: True