]> rtime.felk.cvut.cz Git - can-benchmark.git/commitdiff
continuous: Do not commit shark patch - it breaks bisect
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 10 Apr 2014 14:13:17 +0000 (16:13 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 10 Apr 2014 14:13:17 +0000 (16:13 +0200)
continuous/steps/11-patch

index e3d20beead52e50ded7de75f1fccc61ab940d934..6a9fddb2c105e803ac74d361e7ba2b0672330b2d 100755 (executable)
@@ -4,6 +4,8 @@ set -e
 
 cd linux
 
 
 cd linux
 
+git reset --hard
+
 echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
 
 echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
 
-git am < ../shark-ryu-board-patch.patch
+git apply --index < ../shark-ryu-board-patch.patch