mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 16:25:21 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Francis Dupont
2016-09-28 15:45:25 +02:00
parent 290a761329
commit fe16ba39e7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
util/bind.sh
View File

@@ -104,7 +104,8 @@ then
cd bind/bind9 cd bind/bind9
test -f Makefile && make distclean test -f Makefile && make distclean
git fetch git fetch
git checkout $BINDTAG && test -n "${noSNAP}" && git merge --ff-only git checkout $BINDTAG && test -n "${noSNAP}" && \
git merge --ff-only HEAD
else else
# Delete all previous bind stuff # Delete all previous bind stuff
rm -rf bind rm -rf bind