threads / discuss / 10472

stg branch --create test v2.6.24-rc1 doesn't work

Subject: stg branch --create test v2.6.24-rc1 doesn't work

## tl;dr

4 messages between Oct 26, 2007 and Nov 2, 2007.

replies: 3people: 2as markdown or json

Aneesh Kumar· Oct 26, 2007, 10:42 UTC · lore

$ stg branch --create test v2.6.24-rc1 Checking for changes in the working directory ... done Don't know how to determine parent branch from "v2.6.24-rc1" Branch "test" created [test@linux-review-ext]$ git log

Throws an error/warning in the above command.

Also import then gives

[test@linux-review-ext]$ stg import /home/opensource/patches/ext4-patch-queue/ext4_mballoc_freespace_accounting_fix.patch Checking for changes in the working directory ... done fatal: cebdeed27b068dcc3e7c311d7ec0d9c33b5138c2 is not a valid 'commit' object stg import: git-commit-tree failed with code 128

Catalin Marinas· Oct 29, 2007, 17:11 UTC · re: Aneesh Kumar · lore

Re: stg branch --create test v2.6.24-rc1 doesn't work

On 26/10/2007, Aneesh Kumar <aneesh.kumar@gmail.com> wrote:

Show 16 quoted lines

> $ stg branch --create test v2.6.24-rc1
> Checking for changes in the working directory ... done
> Don't know how to determine parent branch from "v2.6.24-rc1"
> Branch "test" created
> [test@linux-review-ext]$ git log
>
>
> Throws an error/warning in the above command.
>
> Also import then gives
>
> [test@linux-review-ext]$ stg import
> /home/opensource/patches/ext4-patch-queue/ext4_mballoc_freespace_accounting_fix.patch
> Checking for changes in the working directory ... done
> fatal: cebdeed27b068dcc3e7c311d7ec0d9c33b5138c2 is not a valid 'commit' object
> stg import: git-commit-tree failed with code 128

What version of StGIT are you using?

You could try 'stg branch --create test v2.6.24-rc1^{commit} but I thought latest StGIT adds this by default.

-- 
Catalin

Aneesh Kumar· Oct 30, 2007, 04:50 UTC · re: Catalin Marinas · lore

Re: stg branch --create test v2.6.24-rc1 doesn't work

On 10/29/07, Catalin Marinas <catalin.marinas@gmail.com> wrote:

Show 20 quoted lines

> On 26/10/2007, Aneesh Kumar <aneesh.kumar@gmail.com> wrote:
> > $ stg branch --create test v2.6.24-rc1
> > Checking for changes in the working directory ... done
> > Don't know how to determine parent branch from "v2.6.24-rc1"
> > Branch "test" created
> > [test@linux-review-ext]$ git log
> >
> >
> > Throws an error/warning in the above command.
> >
> > Also import then gives
> >
> > [test@linux-review-ext]$ stg import
> > /home/opensource/patches/ext4-patch-queue/ext4_mballoc_freespace_accounting_fix.patch
> > Checking for changes in the working directory ... done
> > fatal: cebdeed27b068dcc3e7c311d7ec0d9c33b5138c2 is not a valid 'commit' object
> > stg import: git-commit-tree failed with code 128
>
> What version of StGIT are you using?
>

Latest stgit.  d4356ac6143757131b58c95ca5c6a7b386cc6087

> You could try 'stg branch --create test v2.6.24-rc1^{commit} but I
> thought latest StGIT adds this by default.
>

-aneesh

Catalin Marinas· Nov 2, 2007, 09:24 UTC · re: Aneesh Kumar · lore

Re: stg branch --create test v2.6.24-rc1 doesn't work

On 26/10/2007, Aneesh Kumar <aneesh.kumar@gmail.com> wrote:

> $ stg branch --create test v2.6.24-rc1
> Checking for changes in the working directory ... done
> Don't know how to determine parent branch from "v2.6.24-rc1"
> Branch "test" created

[...]

Show 5 quoted lines

> [test@linux-review-ext]$ stg import
> /home/opensource/patches/ext4-patch-queue/ext4_mballoc_freespace_accounting_fix.patch
> Checking for changes in the working directory ... done
> fatal: cebdeed27b068dcc3e7c311d7ec0d9c33b5138c2 is not a valid 'commit' object
> stg import: git-commit-tree failed with code 128

The problem is that a tag id is used as the head of the stack rather than the corresponding commit id. I modified StGIT to get the commit id (and, as I said, you can work around this in the meantime by passing "v2.6.24-rc1^{commit}" to the branch command).

I'll push the changes tonight but I have to solve the branch deletion as it is left in an inconsistent state after import (and --force should be able to deal with it but it doesn't).

-- 
Catalin