fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 06:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-from-source: fix checking-out branches by name

Browse source 
Without it, `git checkout -B nmbuild nm-1-10` will fail, because
there is no local branch refs/heads/nm-1-10. Previously, it worked
because there was (one) refs/remotes/origin/nm-1-10, so if we didn't
specify "-B" option, git would create a remote-tracking local branch.

Fix it, by fetching the remote branches as local branches.

Fixes: 2f67ac9eaf
This commit is contained in:
Thomas Haller 2018-04-22 09:35:23 +02:00
parent 2f67ac9eaf
commit b7ba495aa9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/rh-bkr/build-from-source.sh
View file

@ -84,9 +84,10 @@ cd "./NetworkManager/"
# if we fetch from a github repository, we also care about the refs to the pull-requests
# fetch them too.
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 fetch origin
git fetch origin --prune
git checkout -B nmbuild "$BUILD_ID"
echo "HEAD is $(git rev-parse HEAD)"