chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b7169c
)
Try uncommitting a commit with not exactly one parent
author
Karl Hasselström
<kha@treskal.com>
Thu, 20 Mar 2008 23:12:10 +0000
(23:12 +0000)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Thu, 20 Mar 2008 23:12:10 +0000
(23:12 +0000)
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
patch
|
blob
|
blame
|
history
diff --git
a/t/t1300-uncommit.sh
b/t/t1300-uncommit.sh
index d86e579382a805cdb994e3eb27825da855120148..0d952a77178694c66fef3502173168d74480fe72 100755
(executable)
--- a/
t/t1300-uncommit.sh
+++ b/
t/t1300-uncommit.sh
@@
-78,4
+78,9
@@
test_expect_success \
stg commit --all
'
stg commit --all
'
+test_expect_failure 'Uncommit a commit with not precisely one parent' '
+ stg uncommit -n 5 ; [ $? = 2 ] &&
+ [ "$(echo $(stg series))" = "" ]
+'
+
test_done
test_done