From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org, "David Kågedal" <davidk@lysator.liu.se>
Subject: [StGit PATCH 0/5] A few small fixes
Date: Sun, 11 Nov 2007 20:43:24 +0100 [thread overview]
Message-ID: <20071111193545.18868.62490.stgit@yoghurt> (raw)
These are available from
git://repo.or.cz/stgit/kha.git safe
The clean test and the assimilare/repair stuff are new, the rest have
been sitting in kha/safe for a while now.
David: I believe the repair patch should fix the situation you
encountered.
---
Note how the actual patch that renames assimilate to repair looks fine
-- I gave stg mail --diff-opts='-M -C -C'. But the diffstats
apparently don't get those flags, neither the aggregate one below nor
the one just for that patch. We ought to fix that ...
Karl Hasselström (5):
stg repair: Patchify non-patch commits between patches
Rename "stg assimilate" to "stg repair"
Let some commands work with detached HEAD
Cogito is deprecated, so don't point to it
Simple test for "stg clean"
Documentation/stg.txt | 4 -
README | 4 -
contrib/stgit-completion.bash | 2
stgit/commands/add.py | 2
stgit/commands/assimilate.py | 198 -----------------------------------------
stgit/commands/common.py | 2
stgit/commands/repair.py | 192 ++++++++++++++++++++++++++++++++++++++++
stgit/commands/resolved.py | 2
stgit/commands/status.py | 2
stgit/main.py | 4 -
t/t1301-assimilate.sh | 84 -----------------
t/t1301-repair.sh | 80 +++++++++++++++++
t/t1302-assimilate-interop.sh | 59 ------------
t/t1302-repair-interop.sh | 59 ++++++++++++
t/t2500-clean.sh | 27 ++++++
15 files changed, 368 insertions(+), 353 deletions(-)
delete mode 100644 stgit/commands/assimilate.py
create mode 100644 stgit/commands/repair.py
delete mode 100755 t/t1301-assimilate.sh
create mode 100755 t/t1301-repair.sh
delete mode 100755 t/t1302-assimilate-interop.sh
create mode 100755 t/t1302-repair-interop.sh
create mode 100755 t/t2500-clean.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
next reply other threads:[~2007-11-11 19:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-11 19:43 Karl Hasselström [this message]
2007-11-11 19:43 ` [StGit PATCH 1/5] Simple test for "stg clean" Karl Hasselström
2007-11-11 19:43 ` [StGit PATCH 2/5] Cogito is deprecated, so don't point to it Karl Hasselström
2007-11-11 19:43 ` [StGit PATCH 3/5] Let some commands work with detached HEAD Karl Hasselström
2007-11-11 19:43 ` [StGit PATCH 4/5] Rename "stg assimilate" to "stg repair" Karl Hasselström
2007-11-11 19:44 ` [StGit PATCH 5/5] stg repair: Patchify non-patch commits between patches Karl Hasselström
2007-11-12 11:02 ` [StGit PATCH 0/5] A few small fixes Catalin Marinas
2007-11-12 13:01 ` Karl Hasselström
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=20071111193545.18868.62490.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=davidk@lysator.liu.se \
--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 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).