Thank you Ivan and nicolas.
I think now the call of (high level)
git.merge at gitplugin
https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/GitSCM.java#L1160
corresponds with (low level)
git-client-plugin's
https://github.com/jenkinsci/git-client-plugin/blob/master/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java#L416
Correct?
So nicolas, please tell me how you intended to allow for simple flags like
"--no-ff" to flow from high to low.
I think I could replace the high level call with:
launchCommand("merge", rev.name(), MYFLAG );
But I guess this is a rather quick and dirty solution bypassing the wrapper
function.
Use of the @Deprecated public void merge(String refSpec) method at
CliGitAPIImpl.java:1114 is out of the question too, I guess.
So is there a better/intended way of passing flags to actual commands?
A flag setter or a way to use GitSCM.java's "EnvVars environment;" ?
Thank you very much
Michael
Am Montag, 8. Juli 2013 07:03:10 UTC+2 schrieb nicolas de loof:
>
> git plugin relies on git-client plugin for repo commands execution
>
>
> 2013/7/7 Ivan Kalinin <pups...@gmail.com <javascript:>>
>
>> Looks like it is here:
>> https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/GitSCM.java#L1160
>>
>> On Saturday, July 6, 2013 1:46:56 AM UTC+4, michaelsdev wrote:
>>>
>>> Hi,
>>>
>>> Where in the code is the actual "git merge" command ?
>>>
>>> I could not find the place where it is executed.
>>>
>>> Thanks a lot
>>>
>>> Michael
>>>
>> --
>> You received this message because you are subscribed to the Google Groups
>> "Jenkins Developers" group.
>> To unsubscribe from this group and stop receiving emails from it, send an
>> email to jenkinsci-de...@googlegroups.com <javascript:>.
>> For more options, visit https://groups.google.com/groups/opt_out.
>>
>>
>>
>
>
--
You received this message because you are subscribed to the Google Groups
"Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
