From: Francis Dupont <fdupont@isc.org>
Date: Wed, 28 Sep 2016 13:45:25 +0000 (+0200)
Subject: Added HEAD to "git merge --ff-only" for old gits
X-Git-Tag: v4_4_0b1_f1~130^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe16ba39e7411a110c0f623b2160d5bad4b816d2;p=thirdparty%2Fdhcp.git

Added HEAD to "git merge --ff-only" for old gits
---

diff --git a/util/bind.sh b/util/bind.sh
index 13f6fb368..54f5778a1 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -104,7 +104,8 @@ then
 	cd bind/bind9
 	test -f Makefile && make distclean
 	git fetch
-	git checkout $BINDTAG && test -n "${noSNAP}" && git merge --ff-only
+	git checkout $BINDTAG && test -n "${noSNAP}" && \
+	    git merge --ff-only HEAD
 else
 	# Delete all previous bind stuff
 	rm -rf bind