Re: StGIT 0.12.1: pulling up to specific commit (tag)

Re: StGIT 0.12.1: pulling up to specific commit (tag)

[Yann Dirson]

Hi Andrey,

>Now "stg pull" no more accepts branch name; but I cannot figure how to to the 
>same using git config.

(I must say I am not sure to understand the workflow you're using, I
suspect there were some missing steps in your mail).

You probably want "stg rebase <parent branch>", unless you have
commits below your stack base, and that you get a merge commit when
running "git pull".

In the latter case, there is possibly a missing feature: you can get a
merge through git-pull, but you cannot pass the refspec any more.  If
there is a use for this (other than the one already handled by
"rebase"), I'd like to understand the need, so we can add the feature
back in a better way.

Best regards,
-- 
Yann.

Re: StGIT 0.12.1: pulling up to specific commit (tag)

[Andrey Borzenkov]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

On Thursday 08 March 2007, Yann Dirson wrote:
> Hi Andrey,
>
> >Now "stg pull" no more accepts branch name; but I cannot figure how to to
> > the same using git config.
>
> (I must say I am not sure to understand the workflow you're using, I
> suspect there were some missing steps in your mail).
>
> You probably want "stg rebase <parent branch>", unless you have
> commits below your stack base, and that you get a merge commit when
> running "git pull".
>

yes, looks like stg rebase does exactly what I need. Thank you and sorry for 
stupid question.

-andrey

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

StGIT 0.12.1: pulling up to specific commit (tag)

[Andrey Borzenkov]

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

After update to 0.12 I am a bit lost how to do it.

I have local branch for kernel tree that contains several patches. I do not 
want this tree to be up-to-date with the latest commits upstream, rather I 
need it on (sub-)version basis. But there is apparently no way to say in 
stgit "please pull up to specific commit".

What I did before 0.12 was

git branch b2.6.21-rc3 v2.6.21-rc3
stg pull . b2.6.21-rc3

Now "stg pull" no more accepts branch name; but I cannot figure how to to the 
same using git config. I have:

branch.cooker.merge=stgit
branch.cooker.remote=stgit

then I do

git branch stgit v2.6.21-rc3
stg pull .

This always results in "up to date" message and nothing is actually merged in 
current branch. But if I do

stg pop -a
git pull . stgit

then changes *are* merged as expected

So for now I have a workaround, but it is rather awkward. May be I am doing it 
the wrong way and I should just do "stg pull; git reset" but I had bad 
experience with mixing stgit and git tree/index manipulation commands in the 
past.

TIA

-andrey

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]