]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
Added HEAD to "git merge --ff-only" for old gits
authorFrancis Dupont <fdupont@isc.org>
Wed, 28 Sep 2016 13:45:25 +0000 (15:45 +0200)
committerFrancis Dupont <fdupont@isc.org>
Wed, 28 Sep 2016 13:45:25 +0000 (15:45 +0200)
util/bind.sh

index 13f6fb36864b98d963a06e9ad72467b186995b89..54f5778a1a71b121bd6e1f18df956aa4a8080d24 100644 (file)
@@ -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