chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test for specific exit code
[stgit]
/
t
/
t1202-push-undo.sh
diff --git
a/t/t1202-push-undo.sh
b/t/t1202-push-undo.sh
index b602643f9018509bc605de1199afe47bd178453e..544fe8d1a2d5f1ca24bb3163aedf24f0c24f61c2 100755
(executable)
--- a/
t/t1202-push-undo.sh
+++ b/
t/t1202-push-undo.sh
@@
-43,7
+43,7
@@
test_expect_success \
test_expect_success \
'Push the second patch with conflict' \
'
test_expect_success \
'Push the second patch with conflict' \
'
-
!
stg push bar
+
conflict_old
stg push bar
'
test_expect_success \
'
test_expect_success \
@@
-55,7
+55,7
@@
test_expect_success \
test_expect_success \
'Check the push after undo fails as well' \
'
test_expect_success \
'Check the push after undo fails as well' \
'
-
!
stg push bar
+
conflict_old
stg push bar
'
test_expect_success \
'
test_expect_success \