You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Frédéric Camblor <fc...@gmail.com> on 2013/01/30 03:24:46 UTC

[SCM] GitExe : no fetch after push ?

Hi folks !

I recently aligned from git impl v1.6 to 1.8 and there seems to have a
behaviour change between these 2 versions.

I noticed when I call a checkIn(), following commands are executed :
cd <root dir> && git status --porcelain
cd <root dir> && git commit --verbose -F <path to tmp commit file> -a
cd <root dir> && git symbolic-ref HEAD
cd <root dir> && git push git@github.com:fcamblor/myrepo.git master:master

The latest command pushes changes on the server, but it doesn't update my
local origin/master branch (remote "origin" is not used, I suppose that
this is the reason why remote branch is not updated locally during the
push).

Would there be a workaround, either allowing to use "origin" (instead of
"git@github.com:fcamblor/myrepo.git") in the git push command _or_ allow to
execute some sort of a *git fetch origin master* by using gitexe scm API
(or, better, generic SCM API) ?

Thanks in advance,

Frédéric Camblor  <http://fcamblor.wordpress.com/>
<http://www.twitter.com/fcamblor>
Bordeaux JUG <http://bordeauxjug.org/> Leader
Jenkins <http://jenkins-ci.org/> community member & plugin commiter

Re: [SCM] GitExe : no fetch after push ?

Posted by Robert Scholte <rf...@apache.org>.
Assuming you're using the maven-release-plugin, GIT users should use  
version 2.3.2

Robert

Op Wed, 30 Jan 2013 03:24:46 +0100 schreef Frédéric Camblor  
<fc...@gmail.com>:

> Hi folks !
>
> I recently aligned from git impl v1.6 to 1.8 and there seems to have a
> behaviour change between these 2 versions.
>
> I noticed when I call a checkIn(), following commands are executed :
> cd <root dir> && git status --porcelain
> cd <root dir> && git commit --verbose -F <path to tmp commit file> -a
> cd <root dir> && git symbolic-ref HEAD
> cd <root dir> && git push git@github.com:fcamblor/myrepo.git  
> master:master
>
> The latest command pushes changes on the server, but it doesn't update my
> local origin/master branch (remote "origin" is not used, I suppose that
> this is the reason why remote branch is not updated locally during the
> push).
>
> Would there be a workaround, either allowing to use "origin" (instead of
> "git@github.com:fcamblor/myrepo.git") in the git push command _or_ allow  
> to
> execute some sort of a *git fetch origin master* by using gitexe scm API
> (or, better, generic SCM API) ?
>
> Thanks in advance,
>
> Frédéric Camblor  <http://fcamblor.wordpress.com/>
> <http://www.twitter.com/fcamblor>
> Bordeaux JUG <http://bordeauxjug.org/> Leader
> Jenkins <http://jenkins-ci.org/> community member & plugin commiter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: [SCM] GitExe : no fetch after push ?

Posted by Olivier Lamy <ol...@apache.org>.
2013/1/31 Frédéric Camblor <fc...@gmail.com>:
> @Robert : I'm not using maven-release-plugin, that's for a jenkins
> plugin<https://wiki.jenkins-ci.org/display/JENKINS/SCM+Sync+configuration+plugin>
>
>
> @Olivier thanks for the insights
> I'll try to work on a PR, but I need some piece of advice on the "better
> way" to resolve my problem, by staying in the maven scm api
> philosophy/design.
>
> Would you think my problem is purely a git topic (thus, I should implement
> a non generic command like a GitFetchCommand) or could be considered as a
> more generic issue (we could add a "checkinAndFetch" generic method, which
> aliases checkin() in non-DVCS implementations, and checkint()+fetch() in
> DVCS implementations).
>
> WDYT about this ?

this checkinAndFetch sounds goods for me.

>
>
>
> Frédéric Camblor  <http://fcamblor.wordpress.com/>
> <http://www.twitter.com/fcamblor>
> Bordeaux JUG <http://bordeauxjug.org/> Leader
> Jenkins <http://jenkins-ci.org/> community member & plugin commiter
>
>
>
> On Wed, Jan 30, 2013 at 10:23 PM, Olivier Lamy <ol...@apache.org> wrote:
>
>> 2013/1/30 Frédéric Camblor <fc...@gmail.com>:
>> > Hi folks !
>> >
>> > I recently aligned from git impl v1.6 to 1.8 and there seems to have a
>> > behaviour change between these 2 versions.
>> >
>> > I noticed when I call a checkIn(), following commands are executed :
>> > cd <root dir> && git status --porcelain
>> > cd <root dir> && git commit --verbose -F <path to tmp commit file> -a
>> > cd <root dir> && git symbolic-ref HEAD
>> > cd <root dir> && git push git@github.com:fcamblor/myrepo.git
>> master:master
>> >
>> > The latest command pushes changes on the server, but it doesn't update my
>> > local origin/master branch (remote "origin" is not used, I suppose that
>> > this is the reason why remote branch is not updated locally during the
>> > push).
>> >
>> > Would there be a workaround, either allowing to use "origin" (instead of
>> > "git@github.com:fcamblor/myrepo.git") in the git push command _or_
>> allow to
>> > execute some sort of a *git fetch origin master* by using gitexe scm API
>> > (or, better, generic SCM API) ?
>> as it's done currently the scm url is always used (no way to use origin).
>> and update command use pull (not fetch).
>>
>> Patch or pull request welcome :-)
>> sources are now here:
>> https://git-wip-us.apache.org/repos/asf?p=maven-scm.git
>>
>> >
>> > Thanks in advance,
>> >
>> > Frédéric Camblor  <http://fcamblor.wordpress.com/>
>> > <http://www.twitter.com/fcamblor>
>> > Bordeaux JUG <http://bordeauxjug.org/> Leader
>> > Jenkins <http://jenkins-ci.org/> community member & plugin commiter
>>
>>
>>
>> --
>> Olivier Lamy
>> Talend: http://coders.talend.com
>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>



--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: [SCM] GitExe : no fetch after push ?

Posted by Frédéric Camblor <fc...@gmail.com>.
@Robert : I'm not using maven-release-plugin, that's for a jenkins
plugin<https://wiki.jenkins-ci.org/display/JENKINS/SCM+Sync+configuration+plugin>


@Olivier thanks for the insights
I'll try to work on a PR, but I need some piece of advice on the "better
way" to resolve my problem, by staying in the maven scm api
philosophy/design.

Would you think my problem is purely a git topic (thus, I should implement
a non generic command like a GitFetchCommand) or could be considered as a
more generic issue (we could add a "checkinAndFetch" generic method, which
aliases checkin() in non-DVCS implementations, and checkint()+fetch() in
DVCS implementations).

WDYT about this ?



Frédéric Camblor  <http://fcamblor.wordpress.com/>
<http://www.twitter.com/fcamblor>
Bordeaux JUG <http://bordeauxjug.org/> Leader
Jenkins <http://jenkins-ci.org/> community member & plugin commiter



On Wed, Jan 30, 2013 at 10:23 PM, Olivier Lamy <ol...@apache.org> wrote:

> 2013/1/30 Frédéric Camblor <fc...@gmail.com>:
> > Hi folks !
> >
> > I recently aligned from git impl v1.6 to 1.8 and there seems to have a
> > behaviour change between these 2 versions.
> >
> > I noticed when I call a checkIn(), following commands are executed :
> > cd <root dir> && git status --porcelain
> > cd <root dir> && git commit --verbose -F <path to tmp commit file> -a
> > cd <root dir> && git symbolic-ref HEAD
> > cd <root dir> && git push git@github.com:fcamblor/myrepo.git
> master:master
> >
> > The latest command pushes changes on the server, but it doesn't update my
> > local origin/master branch (remote "origin" is not used, I suppose that
> > this is the reason why remote branch is not updated locally during the
> > push).
> >
> > Would there be a workaround, either allowing to use "origin" (instead of
> > "git@github.com:fcamblor/myrepo.git") in the git push command _or_
> allow to
> > execute some sort of a *git fetch origin master* by using gitexe scm API
> > (or, better, generic SCM API) ?
> as it's done currently the scm url is always used (no way to use origin).
> and update command use pull (not fetch).
>
> Patch or pull request welcome :-)
> sources are now here:
> https://git-wip-us.apache.org/repos/asf?p=maven-scm.git
>
> >
> > Thanks in advance,
> >
> > Frédéric Camblor  <http://fcamblor.wordpress.com/>
> > <http://www.twitter.com/fcamblor>
> > Bordeaux JUG <http://bordeauxjug.org/> Leader
> > Jenkins <http://jenkins-ci.org/> community member & plugin commiter
>
>
>
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>

Re: [SCM] GitExe : no fetch after push ?

Posted by Olivier Lamy <ol...@apache.org>.
2013/1/30 Frédéric Camblor <fc...@gmail.com>:
> Hi folks !
>
> I recently aligned from git impl v1.6 to 1.8 and there seems to have a
> behaviour change between these 2 versions.
>
> I noticed when I call a checkIn(), following commands are executed :
> cd <root dir> && git status --porcelain
> cd <root dir> && git commit --verbose -F <path to tmp commit file> -a
> cd <root dir> && git symbolic-ref HEAD
> cd <root dir> && git push git@github.com:fcamblor/myrepo.git master:master
>
> The latest command pushes changes on the server, but it doesn't update my
> local origin/master branch (remote "origin" is not used, I suppose that
> this is the reason why remote branch is not updated locally during the
> push).
>
> Would there be a workaround, either allowing to use "origin" (instead of
> "git@github.com:fcamblor/myrepo.git") in the git push command _or_ allow to
> execute some sort of a *git fetch origin master* by using gitexe scm API
> (or, better, generic SCM API) ?
as it's done currently the scm url is always used (no way to use origin).
and update command use pull (not fetch).

Patch or pull request welcome :-)
sources are now here: https://git-wip-us.apache.org/repos/asf?p=maven-scm.git

>
> Thanks in advance,
>
> Frédéric Camblor  <http://fcamblor.wordpress.com/>
> <http://www.twitter.com/fcamblor>
> Bordeaux JUG <http://bordeauxjug.org/> Leader
> Jenkins <http://jenkins-ci.org/> community member & plugin commiter



--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org