From fd310c6445e63d1a86dbde5c385d0eb89e9d1993 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 9 Mar 2017 00:28:02 +0100 Subject: [PATCH 1/2] Back to how we had it before, because --unshallow does not work at all --- advanced/Scripts/piholeCheckout.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index c1eacd6d..c0ac62e1 100644 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -22,7 +22,8 @@ fully_fetch_repo() { cd "${directory}" || return 1 if is_repo "${directory}"; then - git fetch --quiet --unshallow &> /dev/null || true # Deep repo's cause errors but are valid repos. + git remote set-branches origin '*' || return 1 + git fetch --quiet || return 1 else return 1 fi From 81a1057cac768bc592f2b2676ecfb16a8921a6cf Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 9 Mar 2017 00:30:36 +0100 Subject: [PATCH 2/2] Fix something Dan has overlooked --- advanced/Scripts/piholeCheckout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index c0ac62e1..86ea9a2b 100644 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -145,7 +145,7 @@ checkout() for e in "${webbranches[@]}"; do echo "::: $e"; done exit 1 fi - checkout_pull_branch "${webInterfaceDir}" "${3}" + checkout_pull_branch "${webInterfaceDir}" "${2}" else echo "::: Requested option \"${1}\" is not available!" exit 1