From 2bf971cdadcf03ea4c6faa56bbd4131133db385a Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Mon, 8 Dec 2014 13:24:33 +0800
Subject: [PATCH] new: [docker-builder] don't force a reset origin.

---
 precise/docker-builder/src/usr/local/bin/docker-update | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/precise/docker-builder/src/usr/local/bin/docker-update b/precise/docker-builder/src/usr/local/bin/docker-update
index 24eb034..426ded1 100755
--- a/precise/docker-builder/src/usr/local/bin/docker-update
+++ b/precise/docker-builder/src/usr/local/bin/docker-update
@@ -57,12 +57,14 @@ tmpdir_root=$(mktemp -d $tmpdir/$COMPONENT_NAME.root.XXXXXX)
 trap "clean_all" EXIT
 mount -t aufs -o br=$tmpdir_changes:$DOCKER_UPDATE_PATH/$COMPONENT_NAME -o udba=none  none "$tmpdir_root"
 cd "$tmpdir_root"
-
+set -eux
 ## XXXvlab: We probably would need to:
 ##   - fetch only the module concerned
 ##   - fetch only the ref concerned
 git fetch origin "$BRANCH"
 git checkout "$BRANCH"
+git reset --hard origin/$BRANCH
+#git reset --hard "origin/$BRANCH"
 git sub update
 
 cd / &&