Make merge working for all remote branches (not only master)

[paulslaby]

Git repository had master branch hard-coded. I replaced it with actualy checked-out branch.

Links

• https://bugzilla.redhat.com/show_bug.cgi?id=1508881

Steps for Testing/QA

If you create a repository with no master branch and want to import it to automate, it failed. Now it is fixed. More information in Bugzilla

[mkanoor]

@paulslaby In the lib/git_worktree there are multiple references to master

manageiq/lib/git_worktree.rb

Line 9 in f9f5aef

MASTER_REF = 'refs/heads/master'

Won't all of these have to be fixed.

I am wondering if there is a bug in

manageiq/app/models/git_repository.rb

Line 90 in f9f5aef

repo.send(:fetch_and_merge)

Shouldn't this be calling just fetch, since we are only working with bare repos, and the user is not allowed to change the bare repo. So I am not sure why we would be merging anything

[paulslaby]

@mkanoor Thanks for the reply. In git ecosystem fetch only refreshes information about remotes. We need to do something like git pull, and rugged does that through fetch_and_merge. You are right, that pull method is more descriptive than fetch_and_merge.
So we only need to tell it, which remote and branch we want to merge from. According to libgit2/rugged#314 this is the best way to get branch name.

You are right, that I could remove MASTER_REF completely, so I will, do it.

[paulslaby]

@mkanoor Hello again, I removed all hard-coded references to master. What do you think now?

I wanted to write tests, but I do not know, how to mock remote repository.

[mkanoor]

@paulslaby The lib/gitworktree was part of a project related to implementing Automate models in a Git database. In that model the master branch was the only branch that was being allowed. So I would not remove the MASTER references completely.
The repos that we have currently for Automate are not editable, so there is nothing to merge.
So we should just fixing the call to use fetch.

manageiq/app/models/git_repository.rb

Line 90 in f9f5aef

repo.send(:fetch_and_merge)

Change that to fetch and it will solve your problem.

[paulslaby]

@mkanoor Thank you for you tip. Unfortunately, it does not work.
What will we do about this issue? I have a working patch and I'd like to help you to get it working for others too.

[mkanoor]

@paulslaby I have been trying to add tests but the specs were getting stuck. So I need to figure that out first.

[mkanoor]

@paulslaby Have you looked at the Travis failures.

[miq-bot]

Checked commit paulslaby@0c55372 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 👍

[paulslaby]

@mkanoor Travis is timing out from unknown reason for me. Have you faced it already?

[mkanoor]

@paulslaby
We have a locking mechanism in the lib/git_worktree that was broken with you changes so I have fixed that and added specs. In PR #16690

[paulslaby]

@mkanoor Thank you. I am closing this one as your one will resolve it.