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

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

[Aneesh Kumar]

$ 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

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

[Catalin Marinas]

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?

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

-- 
Catalin

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

[Aneesh Kumar]

On 10/29/07, Catalin Marinas <catalin.marinas@gmail.com> wrote:
> 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

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

[Catalin Marinas]

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]$ 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