Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-23 21:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

stash changes on branch switch, else it fails if any changes have been made.

Browse source
This commit is contained in:
Adam Warner 2017-04-14 17:20:13 +01:00
parent b1484104bd
commit 2e398c5da4
No known key found for this signature in database
GPG key ID: 7C062498C7FA6E49
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
advanced/Scripts/piholeCheckout.sh
View file

@ -54,6 +54,8 @@ fetch_checkout_pull_branch() {
# Set the reference for the requested branch, fetch, check it put and pull it
cd "${directory}"
git remote set-branches origin "${branch}" || return 1
git stash --all --quiet &> /dev/null || return 1
git clean --force -d || return 1
git fetch --quiet || return 1
checkout_pull_branch "${directory}" "${branch}" || return 1
}