From c484bd393e7609933b2729f2bcb4276cb0742364 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Tue, 4 Apr 2023 21:32:52 -0700 Subject: CI: Fix case where upstream base branch already exists --- test/test-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-ci.sh b/test/test-ci.sh index 0905340f..757dc02e 100755 --- a/test/test-ci.sh +++ b/test/test-ci.sh @@ -48,7 +48,7 @@ do_Get_Upstream_Base () { git fetch --depth=30 --no-tags upstream "$base_branch" fi - git branch ci-upstream-base-branch FETCH_HEAD + git branch -f ci-upstream-base-branch FETCH_HEAD # Work out the newest common ancestor between the detached HEAD that this CI # job has checked out, and the upstream target branch (which will typically -- cgit v1.2.1