From 5d749b02ff914f8dd76e60da32987e0c0b2157b5 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Mon, 19 Mar 2018 16:16:41 +0100
Subject: Use more portable syntax of flock

---
 bin/incremental-git-filterbranch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/incremental-git-filterbranch b/bin/incremental-git-filterbranch
index cf9f871..2a785cd 100755
--- a/bin/incremental-git-filterbranch
+++ b/bin/incremental-git-filterbranch
@@ -409,7 +409,7 @@ acquireLock () {
 		exec 9>"${WORKER_REPOSITORY_DIR}.lock"
 		while :
 		do
-			if flock --exclusive --timeout 3 9
+			if flock -w 3 9
 			then
 				break
 			fi
-- 
cgit v1.2.3