chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 52e96a3) | patch
Don't clean away patches with conflicts
authorKarl Hasselström <kha@treskal.com>
Sun, 27 Jan 2008 06:48:02 +0000 (07:48 +0100)
committerKarl Hasselström <kha@treskal.com>
Tue, 29 Jan 2008 03:26:13 +0000 (04:26 +0100)
commita639e7bbf3a6396254af76062ee88c22e4373340
treee26961b43e2fbdfbf072d1c0e535165c27db3756tree | snapshot
parent52e96a352da165a8b56dec8df9b026392fc8dd97commit | diff
Don't clean away patches with conflicts

If we have conflicts, it means that the topmost patch is empty because
of those conflicts (since StGit explicitly makes a conflicting patch
empty), so don't let "stg clean" touch it.

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/commands/clean.py diff | blob | blame | history
stgit/lib/git.py diff | blob | blame | history
t/t2500-clean.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)