From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org, Erik Sandberg <mandolaerik@gmail.com>
Subject: [StGit PATCH 3/6] Try uncommitting a commit with not exactly one parent
Date: Thu, 20 Mar 2008 01:31:45 +0100 [thread overview]
Message-ID: <20080320003145.13102.12700.stgit@yoghurt> (raw)
In-Reply-To: <20080320002604.13102.53757.stgit@yoghurt>
This should fail cleanly -- and in fact it does. Except for printing
an assertion backtrace instead of a nice error message. (This is a
regression introduced by the conversion of "stg uncommit" to the new
infrastructure.)
Found by Erik Sandberg <mandolaerik@gmail.com>.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
t/t1300-uncommit.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh
index d86e579..0d952a7 100755
--- a/t/t1300-uncommit.sh
+++ b/t/t1300-uncommit.sh
@@ -78,4 +78,9 @@ test_expect_success \
stg commit --all
'
+test_expect_failure 'Uncommit a commit with not precisely one parent' '
+ stg uncommit -n 5 ; [ $? = 2 ] &&
+ [ "$(echo $(stg series))" = "" ]
+'
+
test_done
next prev parent reply other threads:[~2008-03-20 0:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-20 0:31 [StGit PATCH 0/6] Two bugfixes Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 1/6] Use a special exit code for bugs Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 2/6] Make sure patches with no parents have an empty list of parents Karl Hasselström
2008-03-20 0:31 ` Karl Hasselström [this message]
2008-03-20 0:31 ` [StGit PATCH 4/6] Make sure that we only uncommit commits with exactly one parent Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 5/6] New test: conflicting push in dirty worktree Karl Hasselström
2008-03-20 0:32 ` [StGit PATCH 6/6] Handle failed pushes differently depending on cause Karl Hasselström
2008-03-20 15:19 ` [StGit PATCH 0/6] Two bugfixes Catalin Marinas
2008-03-24 8:35 ` Karl Hasselström
2008-03-24 9:16 ` Catalin Marinas
2008-03-24 18:12 ` Karl Hasselström
2008-03-25 10:46 ` Catalin Marinas
2008-03-25 11:05 ` Karl Hasselström
2008-03-25 15:27 ` Catalin Marinas
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=20080320003145.13102.12700.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=mandolaerik@gmail.com \
/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.