Re: [PATCHv4 1/1] git-p4: add unshelve command

On Tue, May 22, 2018 at 12:09 AM, Luke Diamand wrote: > On 21 May 2018 at 22:39, SZEDER Gábor wrote: >>> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh > > ... > ... > >>> +' >> >> This test fails on my box and on Travis CI (in all four standard

Re: [PATCHv4 1/1] git-p4: add unshelve command

On 21 May 2018 at 23:09, Luke Diamand wrote: > On 21 May 2018 at 22:39, SZEDER Gábor wrote: >>> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh > > ... > ... > >>> +' >> >> This test fails on my box and on Travis CI (in all four standard Linux >>

Re: [PATCHv4 1/1] git-p4: add unshelve command

On 21 May 2018 at 22:39, SZEDER Gábor wrote: >> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh ... ... >> +' > > This test fails on my box and on Travis CI (in all four standard Linux > and OSX build jobs) with: > > + cd /home/szeder/src/git/t/trash

Re: [PATCHv4 1/1] git-p4: add unshelve command

> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh > new file mode 100755 > index 00..cca2dec536 > --- /dev/null > +++ b/t/t9832-unshelve.sh > @@ -0,0 +1,153 @@ > +#!/bin/sh > + > +last_shelved_change() { > + p4 changes -s shelved -m1 | cut -d " " -f 2 > +} > + >

Re: [PATCHv4 1/1] git-p4: add unshelve command

On 21 May 2018 at 08:07, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh >>> new file mode 100755 >>> index 00..cca2dec536 > > ... in short, I'd queue a fix-up on top like this to be later

Re: [PATCHv4 1/1] git-p4: add unshelve command

SZEDER Gábor writes: >> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh >> new file mode 100755 >> index 00..cca2dec536 ... in short, I'd queue a fix-up on top like this to be later squashed after getting an ack? t/t9832-unshelve.sh | 23

Re: [PATCHv4 1/1] git-p4: add unshelve command

> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh > new file mode 100755 > index 00..cca2dec536 > --- /dev/null > +++ b/t/t9832-unshelve.sh > @@ -0,0 +1,153 @@ > +#!/bin/sh > + > +last_shelved_change() { Style nit: space between function name and () > + p4 changes -s shelved

Re: Re :[PATCHv4 1/1] git-p4: add unshelve command

On 19 May 2018 at 12:26, merlo...@yahoo.fr wrote: > Hi Luke, > > In the P4Unshelve classe, could you add an help description directly in the > optparse.add_option of --origin ? Sure. I'll do a re-roll. > > From the workfow point of you, do you think it will be possible to

[PATCHv4 1/1] git-p4: add unshelve command

This can be used to "unshelve" a shelved P4 commit into a git commit. For example: $ git p4 unshelve 12345 The resulting commit ends up in the branch: refs/remotes/p4/unshelved/12345 If that branch already exists, it is renamed - for example the above branch would be saved as