git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* stgit: cannot push a patch - Python trace dump
@ 2006-09-15  5:07 Auke Kok
  2006-09-15  8:58 ` Catalin Marinas
  0 siblings, 1 reply; 4+ messages in thread
From: Auke Kok @ 2006-09-15  5:07 UTC (permalink / raw)
  To: git


Hi all,

I'm preparing patches for upstream and am haunted by an apparent patch breaking
stg. The problem appears to be one or more of my patches breaking a push:

$ stg push
Traceback (most recent call last):
   File "/usr/bin/stg", line 43, in ?
     main()
   File "/usr/lib/python2.4/site-packages/stgit/main.py", line 255, in main
     command.func(parser, options, args)
   File "/usr/lib/python2.4/site-packages/stgit/commands/push.py", line 101, in
func
     push_patches(patches, options.merged)
   File "/usr/lib/python2.4/site-packages/stgit/commands/common.py", line 160,
in push_patches
     forwarded = crt_series.forward_patches(patches)
   File "/usr/lib/python2.4/site-packages/stgit/stack.py", line 789, in
forward_patches
     committer_email = committer_email)
   File "/usr/lib/python2.4/site-packages/stgit/git.py", line 439, in commit
     if message[-1:] != '\n':
TypeError: unsubscriptable object


I've been abusing stg by leaving the commit messages empty so I assume that
that's the cause here, or related to the problem.

This happens with today's stg as well as stg-0.10

After scraping all my patches out manually and adding meaningfull (non-empty) 
commit messages I seem to be able to push and pop them all again.

Cheers,

Auke

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: stgit: cannot push a patch - Python trace dump
  2006-09-15  5:07 stgit: cannot push a patch - Python trace dump Auke Kok
@ 2006-09-15  8:58 ` Catalin Marinas
  2006-09-15 14:26   ` Auke Kok
  0 siblings, 1 reply; 4+ messages in thread
From: Catalin Marinas @ 2006-09-15  8:58 UTC (permalink / raw)
  To: Auke Kok; +Cc: git

Auke Kok <auke-jan.h.kok@intel.com> wrote:
> I'm preparing patches for upstream and am haunted by an apparent
> patch breaking stg. The problem appears to be one or more of my
> patches breaking a push:
[...]
> I've been abusing stg by leaving the commit messages empty so I
> assume that that's the cause here, or related to the problem.

Thanks, I fixed StGIT to cope with this and I'll update the repository
and snapshot tonight (which, BTW, will contain the initial support for
patch history tracking).

-- 
Catalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: stgit: cannot push a patch - Python trace dump
  2006-09-15  8:58 ` Catalin Marinas
@ 2006-09-15 14:26   ` Auke Kok
  2006-09-15 14:33     ` Catalin Marinas
  0 siblings, 1 reply; 4+ messages in thread
From: Auke Kok @ 2006-09-15 14:26 UTC (permalink / raw)
  To: Catalin Marinas; +Cc: git

Catalin Marinas wrote:
> Auke Kok <auke-jan.h.kok@intel.com> wrote:
>> I'm preparing patches for upstream and am haunted by an apparent
>> patch breaking stg. The problem appears to be one or more of my
>> patches breaking a push:
> [...]
>> I've been abusing stg by leaving the commit messages empty so I
>> assume that that's the cause here, or related to the problem.
> 
> Thanks, I fixed StGIT to cope with this and I'll update the repository
> and snapshot tonight (which, BTW, will contain the initial support for
> patch history tracking).

awesome and awesome, allthough I have no idea what that (patch history 
tracking) is about :)

Auke

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: stgit: cannot push a patch - Python trace dump
  2006-09-15 14:26   ` Auke Kok
@ 2006-09-15 14:33     ` Catalin Marinas
  0 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2006-09-15 14:33 UTC (permalink / raw)
  To: Auke Kok; +Cc: git

On 15/09/06, Auke Kok <auke-jan.h.kok@intel.com> wrote:
> Catalin Marinas wrote:
> > Thanks, I fixed StGIT to cope with this and I'll update the repository
> > and snapshot tonight (which, BTW, will contain the initial support for
> > patch history tracking).
>
> awesome and awesome, allthough I have no idea what that (patch history
> tracking) is about :)

It keeps the history of all the patch modifications (like refresh,
push) so that you can get previous versions if something went wrong.
It's like having many small commits reflecting the changes to a patch.
These commits are totally separate from the main patch commit (so that
an StGIT repository is still compatible with GIT) but you can access
them with "stg log [--graphical] <patch>". The --graphical option will
automatically invoke gitk.

-- 
Catalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2006-09-15 14:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-15  5:07 stgit: cannot push a patch - Python trace dump Auke Kok
2006-09-15  8:58 ` Catalin Marinas
2006-09-15 14:26   ` Auke Kok
2006-09-15 14:33     ` Catalin Marinas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).