From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Tue, 19 Mar 2019 17:00:12 +0000 (-0400)
Subject: zygo: all git ops need to be done with the _same_ lock
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78da3faa19f2ecdf6db26fc763ff2daf0f49d59d;p=linux

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 8ffc02e210e1..3bc7275f26c7 100755
--- 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 8e6a74b37dc4..ce49faa7f940 100755
--- 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