Re: Problems using StGit and -rt kernel patchset

From: Catalin Marinas <catalin.marinas@arm.com>
Date: Oct 5, 2007, 13:45 UTC
Message-ID: <1191591921.7321.63.camel@pc1117.cambridge.arm.com>
In-Reply-To: <4703A4EE.3000002@gmail.com>

Clark,

What version of StGIT are you using? You might use a too new GIT with an older StGIT or maybe there are just some bugs in StGIT.

On Wed, 2007-10-03 at 09:19 -0500, Clark Williams wrote:

Show 12 quoted lines

> I've been working on the -rt patch series for the kernel and would like to to use
> StGit to manage the patches. Unfortunately I've had limited success, so I thought I'd
> ask the git/stgit community if what I'm doing is wrong.
> 
> I clone Linus's tree to a common directory, then clone it locally to work:
> 
> $ git clone -s -l /home/src/linux-2.6.git scratch.git
> $ cd scratch.git
> $ stg init
> $ stg branch --create rt-2.6.23-rc8-rt1 v2.6.23-rc8
> $ stg import --series --ignore --replace ../sources/patch-queue-2.6.23-rc8-rt1/series
> <fix the things quilt lets through and stg barfs on, like malformed email addresses>

If git-quiltimport behaves better with malformed patches, use it and run 'stg uncommit -n 368' afterwards (the 'uncommit' takes some other useful options as well, see --help).

> <watch 368 patches be applied and committed>
> <work work work>

Do you modify any of the -rt patches or you create new ones?

Show 9 quoted lines

> <get a new patch queue>
> $ (cd /home/src/linux-2.6.git && git pull)
> $ stg pull
> $ stg branch --create rt-2.6.23-rc8-rt1 v2.6.23-rc9
> $ stg import --series --ignore --replace ../sources/patch-queue-2.6.23-rc9-rt1/series
> Checking for changes in the working directory ... done
> stg import: env git-commit-tree 520b9d0db6a1142271a68b2b38cca002be40f6cb -p
> da0a81e98c06aa0d1e05b9012c2b2facb1807e12 failed (fatal:
> da0a81e98c06aa0d1e05b9012c2b2facb1807e12 is not a valid 'commit' object)

I'm not sure why the first import worked. It seems that StGIT uses the tag id (da0a81e9) rather than the corresponding commit id (3146b39c). I remember having this problem in the past when creating branches and I fixed StGIT to always get the corresponding commit id. Using 'v2.6.23-rc9^{commit}' as the 'branch' argument rather than just the tag should fix the problem.

> At this point I'm clueless as to:
> 
> 1. What I've done wrong

Probably nothing (just hidden features of StGIT :-))

> 2. How to recover/debug this

You can recreate the branch with the commit rather than tag id. With a sufficiently new StGIT, you could use 'stg rebase <id>' on the branch. I assume that no patch was pushed because import failed (though the first imported patch might be in an undefined state and can be removed).

Catalin