Allow creation of a merge commit even when the merge resolves as a fast-forward

[JakeGinnivan]

We are using libgit2sharp to write tests around GitFlow, it would be good to allow merge options in the API including no fast forward

[andreasohlund]

+1 explains why I couldn't figure out how to do it:)

[nulltoken]

This is crying "Please add a MergeOptions to the IRepository.Merge(Commit, Signature) method"...

/cc @jamill @ethomson Thoughts?

[JakeGinnivan]

@nulltoken based on my quick digging, that looks like it would be really easy to do and if the feature was there not to fast forward that would be where I would expect it to be

[nulltoken]

@JakeGinnivan Would you like like sending a Pull Request?

[JakeGinnivan]

Not right now, really need to finish this GitVersion PR :P

[JakeGinnivan]

Also, is it possible to merge branches, rather than commits?

I am getting messages like this: Merge commit '9ef58596be4ee1b869915b17d712916bffec42da'

[nulltoken]

This is a different topic. This method accepts a Commit. As this commit may be the tip of several different branches, we don't even try to infer its origin.

IMO, in order to provide a more meaningful message, a different overload should be created accepting a Branch.

[JakeGinnivan]

I have worked around the issue by amending the merge commit, which works for the moment. But yeah that would be good, should I create another issue?

[nulltoken]

I have worked around the issue by amending the merge commit

Good call 😉

should I create another issue?

Please do.

[jamill]

This is crying "Please add a MergeOptions to the IRepository.Merge(Commit, Signature) method"...

Yes! PR #643 adds this very parameter. It will need to be updated based on recent changes to the merge API in libgit2.

[jamill]

Also - #643 adds the No Fast Forward and No Commit options. If you wanted to take a look at the proposed API updates and provide feedback, that is where they are.

I would wait until the changes in https://github.com/libgit2/libgit2sharp/tree/jamill/libgit2_update were included before expanding the merge API.