From 9a65aaf44479ed93ac8584e1345dbfbae5ad0417 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 3 May 2021 16:42:01 -0600 Subject: [PATCH] makefile: fix pb-fetch after starting with `--single-branch` mode --- .makefile | 1 + Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/.makefile b/.makefile index fd173a4ecf..916324ccf3 100644 --- a/.makefile +++ b/.makefile @@ -448,6 +448,7 @@ fetch-pb-from: if [ ! -d racket/src/ChezScheme/boot/pb ] ; \ then git clone -q $(SINGLE_BRANCH_FLAG) -b $(PB_BRANCH) $(PB_REPO) $(PB_DIR) ; \ else cd $(PB_DIR) && git fetch -q origin $(PB_BRANCH):remotes/origin/$(PB_BRANCH) ; fi + cd $(PB_DIR) && git remote set-branches origin $(PB_BRANCH) cd $(PB_DIR) && git checkout -q $(PB_BRANCH) pb-fetch: diff --git a/Makefile b/Makefile index 603230e6a6..52c1566e73 100644 --- a/Makefile +++ b/Makefile @@ -311,6 +311,7 @@ maybe-fetch-pb-as-is: fetch-pb-from: mkdir -p racket/src/ChezScheme/boot if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q $(SINGLE_BRANCH_FLAG) -b circa-8.1.0.4-1 $(PB_REPO) racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-8.1.0.4-1:remotes/origin/circa-8.1.0.4-1 ; fi + cd racket/src/ChezScheme/boot/pb && git remote set-branches origin circa-8.1.0.4-1 cd racket/src/ChezScheme/boot/pb && git checkout -q circa-8.1.0.4-1 pb-fetch: $(MAKE) fetch-pb EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" PB_REPO="$(PB_REPO)" SINGLE_BRANCH_FLAG="$(SINGLE_BRANCH_FLAG)"