git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[StGit PATCH 0/5] A few small fixes

From
Karl Hasselström <kha@treskal.com>
Date
Nov 11, 2007, 19:43 UTC
Message-ID
<20071111193545.18868.62490.stgit@yoghurt>
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: Karl Hasselström
Message 1 of 8 in “A few small fixes”
  1. 0/5 A few small fixesKarl Hasselström, Nov 11, 2007
  2. 1/5 Simple test for "stg clean"Karl Hasselström, Nov 11, 2007
  3. 2/5 Cogito is deprecated, so don't point to itKarl Hasselström, Nov 11, 2007
  4. 3/5 Let some commands work with detached HEADKarl Hasselström, Nov 11, 2007
  5. 4/5 Rename "stg assimilate" to "stg repair"Karl Hasselström, Nov 11, 2007
  6. 5/5 stg repair: Patchify non-patch commits between patchesKarl Hasselström, Nov 11, 2007
  7. Catalin MarinasNov 12, 2007
  8. Karl HasselströmNov 12, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.