diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2023-04-04 21:32:52 -0700 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2023-04-04 21:32:58 -0700 |
| commit | c484bd393e7609933b2729f2bcb4276cb0742364 (patch) | |
| tree | fa6a21657bb495264e609b97249d1dfd3b1b1f0c | |
| parent | f6374c8308ba9749e3784ca7469b11d297beb718 (diff) | |
| download | gjs-c484bd393e7609933b2729f2bcb4276cb0742364.tar.gz | |
CI: Fix case where upstream base branch already exists
| -rwxr-xr-x | test/test-ci.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |