New code detection using reference branch is incorrect

[scrungwirth (Scott Jungwirth)]

• versions used (server: 8.9, scanner: 4.6.2)
• error observed: new code detection is incomplete after merging reference branch into target branch
• steps to reproduce:

1. create new (target) branch from mainbranch,
2. make and commit changes.
3. merge (non-ff, merge commit for example) some OTHER changes to mainbranch
4. merge mainbranch into target branch.
5. run scan using new code detection reference branch of mainbranch
6. note that new code detection doesn’t correctly show changes in step 2

• potential workaround: git rebase $(git merge-base HEAD mainbranch) before running scanner in step 5

[ganncamp (G Ann Campbell)]

Hi,

Welcome to the community!

Is this relevant?

Clarification on Reference Branch Analysis

Hi, Do you do merge commits or use the rebase workflow in git? Unfortunately there’s a bug when using the merge workflow. Here are the details: [SONAR-14929] New Code using a 'reference branch' doesn't detect changed code with git merge workflow - SonarSource

 
HTH,
Ann

[scrungwirth (Scott Jungwirth)]

hi @ganncamp ,
yep, that sounds like the same issue to me.

[ganncamp (G Ann Campbell)]

Thanks for confirming. I’m going to mark a solution on this thread just for tidiness.

 
Ann