From 76f7b77b2e14f324b1f78bcf97be581a0bf670cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Sun, 25 Feb 2018 11:36:46 +0000
Subject: Fixes transient mintty build failures (via katex.)
 subr/ex_rtl_fetch.subr:exp_rtl_fetch_url_git(): correctly handle Git URL
 branch suffixes.

---
 subr/ex_rtl_fetch.subr | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'subr')

diff --git a/subr/ex_rtl_fetch.subr b/subr/ex_rtl_fetch.subr
index 086a7954..babf267f 100644
--- a/subr/ex_rtl_fetch.subr
+++ b/subr/ex_rtl_fetch.subr
@@ -10,11 +10,9 @@ exp_rtl_fetch_url_git() {
 			git pull origin "${_branch:-main}");
 	else
 		git clone "${_url}" "${BUILD_DLCACHEDIR}/${_subdir}";
-		if [ -n "${_branch}" -a		\
-		     \( -z "${_branch#main}" \) -a	\
-		     \( -z "${_branch#master}" \) ]; then
-			(ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}"	&&\
-				git checkout -b "${_branch}");
+		if [ -n "${_branch}" ]; then
+			(ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
+				git checkout "${_branch}");
 		fi;
 	fi;
 	_oldpwd="${PWD}"; ex_rtl_fileop cd "${PKG_BASE_DIR}";
-- 
cgit v1.2.3