I noticed that the output of git merge-base master HEAD was different on my local system than the CI system. After some digging around I found something strange. The commits on master and $CIRCLE_BRANCH are exactly the same (which should not be the case as the feature branch is ahead of master whe…

If I understand correctly, We optimize checkout significantly and only guarantee that the current branch checkout matches the branch that should be built. you could run git fetch && git merge-base origin/master HEAD to get your desired behavior thanks! RK

That’s a good workaround as well. Luckily my tool allows injecting custom commit for merge-base. I don’t know how other tools handle this but it still feels wrong to have master and $CIRCLE_BRANCH including the same content.

Checkout script adds commits to master from $CIRCLE_BRANCH

Feedback & Bug Reports

Topic		Replies	Views
Git checkout of a branch destroys local reference to master Feedback & Bug Reports git	15	16766	August 18, 2022
The checkout step mangles branches, messes the history Feedback & Bug Reports git , circle-yml , 2.0	0	3324	September 8, 2018
Checkout is wonky and is preventing a monorepo style repo here Build Environment	0	646	April 6, 2020
'checkout' not working - I'm stuck on master? Build Environment	2	2088	June 16, 2020
Changing Git branches causes commits from one branch to carry over to the next Feedback & Bug Reports github , api , git	1	2213	June 21, 2017

Checkout script adds commits to master from $CIRCLE_BRANCH

Related topics