This fixes the two issues Aneesh reported (failed branch deletion, leftover config stuff), and adds a test. The test is added after the fixes this time, so the test suite passes at every step. Also available from git://repo.or.cz/stgit/kha.git safe --- Karl Hasselström (4): Add simple test for "stg branch --delete" Properly remove all config for a deleted branch Don't try to delete the branch twice Don't special-case the "master" branch during branch delete stgit/commands/branch.py | 10 +--------- stgit/config.py | 7 +++++++ stgit/stack.py | 9 ++------- t/t1005-branch-delete.sh | 29 +++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 16 deletions(-) create mode 100755 t/t1005-branch-delete.sh -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html