All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: StGIT fails to clean patch series, and to go to a patch
Date: Sat, 3 Nov 2007 10:45:20 +0100	[thread overview]
Message-ID: <200711031045.21506.jnareb@gmail.com> (raw)

I have patch series with empty patch in the middle of the stack.
After trying to stg-clean (and failing) stack looks like below:

1167:[gitweb/web!git]$ stg series -e -s
+ gitweb-Always-set-from_file-to_file
+ gitweb-Add-status_str-diffinfo
+ gitweb-Easier-adding-parameters-to-current-URL
+ gitweb-Use-replay-to-generate-pagination
> gitweb-Use-replay-to-generate-alt-views
0 gitweb-Update-INSTALL-file
- gitweb-No-CGI_Carp-in-test
- gitweb-Test-config-override
- gitweb-Config-reader
- gitweb-Use-config-more

Now stg-rebase works, but stg-goto doesn't work. It returns
the following error.

1164:[gitweb/web!git]$ stg goto gitweb-Use-config-more 
Checking for changes in the working directory ... done
Traceback (most recent call last):
  File "/usr/bin/stg", line 43, in ?
    main()
  File "/usr/lib/python2.4/site-packages/stgit/main.py", line 284, in main
    command.func(parser, options, args)
  File "/usr/lib/python2.4/site-packages/stgit/commands/goto.py", line 63, in func
    push_patches(patches)
  File "/usr/lib/python2.4/site-packages/stgit/commands/common.py", line 165, in push_patches
    forwarded = crt_series.forward_patches(patches)
  File "/usr/lib/python2.4/site-packages/stgit/stack.py", line 954, in forward_patches
    bottom_tree = git.get_commit(bottom).get_tree()
  File "/usr/lib/python2.4/site-packages/stgit/git.py", line 136, in get_commit
    commit = Commit(id_hash)
  File "/usr/lib/python2.4/site-packages/stgit/git.py", line 77, in __init__
    lines = _output_lines(['git-cat-file', 'commit', id_hash])
  File "/usr/lib/python2.4/site-packages/stgit/git.py", line 196, in _output_lines
    raise GitException, '%s failed (%s)' % (' '.join(cmd),
TypeError: sequence item 2: expected string, NoneType found
1165:[gitweb/web!git]$ stg version
Stacked GIT 0.13
git version 1.5.3.5
Python version 2.4.3 (#1, Jun 13 2006, 16:41:18) 
[GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]
-- 
Jakub Narebski
Poland

             reply	other threads:[~2007-11-03  9:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-03  9:45 Jakub Narebski [this message]
2007-11-03 10:32 ` StGIT fails to clean patch series, and to go to a patch Catalin Marinas
2007-11-03 13:17   ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200711031045.21506.jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.