From c3e2a2175225a19ded8b5c830dc92e0ab956db91 Mon Sep 17 00:00:00 2001
From: "Stefan \"Bebbo\" Franke" <bebbo@bejy.net>
Date: Sun, 14 Apr 2019 11:38:45 +0200
Subject: [PATCH] make update-repos restricts the branches to the used one

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a0cd753..2e90642 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ GCC_VERSION ?= $(shell cat 2>/dev/null projects/gcc/gcc/BASE-VER)
 
 BINUTILS_BRANCH := amiga
 GCC_BRANCH := gcc-6-branch
+NEWLIB_BRANCH := amiga
 
 GIT_AMIGA_NETINCLUDE := https://github.com/bebbo/amiga-netinclude
 GIT_BINUTILS         := https://github.com/bebbo/binutils-gdb
@@ -98,8 +99,8 @@ UPDATE = __x=
 ANDPULL = ;__y=$$(git branch | grep '*' | cut -b3-);echo setting remote origin from $$(git remote get-url origin) to $$__x using branch $$__y;\
 	git remote remove origin; \
 	git remote add origin $$__x; \
-	git pull origin $$__y;\
-	git branch --set-upstream-to=origin/$$__y $$__y; \
+	git remote set-branches origin $$__y;\
+	git pull
 
 # =================================================
 
@@ -922,7 +923,7 @@ $(BUILD)/newlib/newlib/Makefile: projects/newlib-cygwin/configure
 
 projects/newlib-cygwin/newlib/configure:
 	@mkdir -p projects
-	@cd projects &&	git clone -b amiga --depth 4  $(GIT_NEWLIB_CYGWIN)
+	@cd projects &&	git clone -b $(NEWLIB_BRANCH) --depth 4  $(GIT_NEWLIB_CYGWIN)
 
 # =================================================
 # ixemul