From d8f99fe901fd528b1853f6ec043d7f5622b3456d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 23 Apr 2018 15:39:15 +0200 Subject: [PATCH] build-from-source: fix checking-out branches by name (2) git doesn't like to fetch into a local branch which is currently checked out. $ git fetch origin --prune fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository We need to first checkout a plain commit (detached HEAD). Fixes: 2f67ac9eafde3f9979224ce6ce30de3d5f3e1862 --- contrib/rh-bkr/build-from-source.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh index 7fc7fd758e..9865167bab 100755 --- a/contrib/rh-bkr/build-from-source.sh +++ b/contrib/rh-bkr/build-from-source.sh @@ -87,9 +87,10 @@ cd "./NetworkManager/" git config --add remote.origin.fetch '+refs/heads/*:refs/heads/*' git config --add remote.origin.fetch '+refs/tags/*:refs/nmbuild-origin/tags/*' git config --add remote.origin.fetch '+refs/pull/*:refs/nmbuild-origin/pull/*' +git checkout HEAD^{} git fetch origin --prune - git checkout -B nmbuild "$BUILD_ID" + echo "HEAD is $(git rev-parse HEAD)" if [[ "$DO_TEST_BUILD" == yes ]]; then