Git checkout of a branch destroys local reference to master

#1

When building a branch (let’s say branch1), the Checkout code step will do this after cloning the git repository:

git reset --hard "$CIRCLE_SHA1"
git checkout -q -B "$CIRCLE_BRANCH"
git reset --hard "$CIRCLE_SHA1"

This will make the local reference of master point to the HEAD of branch1 before checking out branch1.
The first command should probably be simply git reset --hard or a git clean -fd (just to ensure that the checkout following it will succeed).

I’ve confirmed the problem with the following build. When building a branch, master is pointing to that same branch:
https://circleci.com/gh/dbmeneses/test_git/5

It creates problems when running SonarCloud analysis, as the scanner will be tricked into thinking that there are no changes in the current branch compared to master:

2 Likes
#2

relates to The checkout step mangles branches, messes the history and Checkout script adds commits to master from $CIRCLE_BRANCH

I am experimenting with using a manual near-identical version of the circle-ci “checkout” step, removing the line that results in the master branch being reset --hard onto the $CIRCLE_SHA1

#3

Another problem with SonarCloud was reported that is linked to this bug: https://community.sonarsource.com/t/gradle-subprojects-not-reported-to-sonarcloud-for-github-pull-requests/164/

#4

Yet another issue with git branch mess ? https://community.sonarsource.com/t/no-code-or-issue-found-in-pull-request-decorations-github-circleci/8496

#5

Anyone have success resolving this?

#6

@timols: the checkout step is optional, so if you wish you can replace it with your own Git calls completely.

#7

It would see them the following will remedy the situation:

git branch -f master origin/master
1 Like
#8

Exist any workaround to fix this issue?
Is terrible to pay a tool easy like circle-ci and switch to other tools only for this issue.

Thank you

#9

Yes, here:

#11

Sorry I try to explain better my question… " someone have a checkout script that maybe resolve this problem?"

#12

They might do, but it is probably a few lines of Git calls in Bash, so… :slightly_smiling_face:

#13

But I don’t get it… the checkout step provided by circleci is quite… extensive. I don’t want to replace it. When you @halfer say:

(…) replace it with your own Git calls completely

do you mean actually copy paste circle’s checkout step into our own pipeline and then add that extra line:
git branch -f master origin/master ?

#14

It is, and I’ve pretty much no idea what it is doing! If I had a need to do a custom checkout, then writing my own Git calls - and understanding what they do - would be my approach.