GIT Merge's appearing in Source Tab

We have a weird issue with our Fisheye/JIRA/Cruicible setup that we can't work out why it is happening.

We develop on separate 'Story' branches, that then get merged into a 'Feature' branch, then to release merged down onto 'Master'

Sometimes a merge will appear against a JIRA ticket in the Source tab, most often without any files against it in the row. This then makes it impossible to create a Cruicible review against it and our workflow fails as not all the changes against a ticket have been reviewed.

In the case below you can see there are no files listed under the commit message.

A Developer <a.developer@acompany.com> submitted changeset 722652c42f7f575e32390c015b7b36b0e315e8c4 to bugfix_ja_portal-600_v1.4.1 in Repo.git (0 file) - 28/Jun/12 11:36 AM

Merge branch 'bugfix_ja_portal-581_v1.4.1' into bugfix_v1.4.1

All the other changes against the ticket have the ticket id in the commit message within the source tab. This one doesn't. Should we be doing something different here, like a rebase down before a merge? Or is this a bug within Fisheye when indexing the changes?

2 answers

1 accepted

Accepted Answer
0 votes
Jason Hinch Atlassian Team Jul 10, 2012

FishEye links commits to JIRA issues based on a the commit message. It searches the message via a regular expression looking for characters which look like JIRA keys. It has no relation to the files in the commit/merge. It looks like the merge is being picked up because of the portal-581 part in the message. If commits on the feature branch aren't showing in the source tab that is probably because they don't contain the same JIRA key in their message.

We've started renaming our branches a little differently and haven't noticed it again. That wasn't the behaviour I was totally expecting, mainly because we don't normally have to put a commit message in when merging. Makes sense now though, thanks.

Hi David,

We also facing the same issue. Git merge diffs are not available in fisheye. Can you please elaborate your suggested solution?

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Tuesday in Jira

Looking for anyone who made the switch to Data Center

The Jira Marketing team is putting together an ebook on migrating to Data Center. We're looking for pro tips on how you staffed your project team and organized your Proof of Concept. Share yo...

29 views 0 2
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you