zygo: all git ops need to be done with the _same_ lock

(cherry picked from commit 4d7fa7c1d722a66c6df51a82dce30e61af4db78c)

diff --git a/zygo/do b/zygo/do
index 8ffc02e210e171d9923a48b91aa846021dbe93bd..3bc7275f26c7c2a92ab4361db0fb054433c8c81f 100755 (executable)
--- a/zygo/do
+++ b/zygo/do
@@ -19,7 +19,7 @@ cd .
 PATH="$PWD/zygo:$ORIG_PATH"
 
 # Reset kernel sources to git HEAD
-reset-kernel
+flock -x .git/description reset-kernel
 trash debian
 
 # Reset module sources from Debian

diff --git a/zygo/reset-kernel b/zygo/reset-kernel
index 8e6a74b37dc43dd9bce9acdb5281cbe4adaa8107..ce49faa7f940058c29080af1e79976bf4648b866 100755 (executable)
--- a/zygo/reset-kernel
+++ b/zygo/reset-kernel
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -x
-flock -x .git/description git clean -qdfx
-flock -x .git/description git reset --hard
+git clean -qdfx
+git reset --hard