~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generate command lists automatically
[stgit]
/
t
/
t1202-push-undo.sh
diff --git
a/t/t1202-push-undo.sh
b/t/t1202-push-undo.sh
index
335b554
..
544fe8d
100755
(executable)
--- a/
t/t1202-push-undo.sh
+++ b/
t/t1202-push-undo.sh
@@
-21,7
+21,7
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > test &&
'
stg new foo -m foo &&
echo foo > test &&
-
stg
add test &&
+
git
add test &&
stg refresh
'
stg refresh
'
@@
-30,7
+30,7
@@
test_expect_success \
'
stg new bar -m bar &&
echo bar > test &&
'
stg new bar -m bar &&
echo bar > test &&
-
stg
add test &&
+
git
add test &&
stg refresh
'
stg refresh
'
@@
-40,10
+40,10
@@
test_expect_success \
stg pop --all
'
stg pop --all
'
-test_expect_
failure
\
+test_expect_
success
\
'Push the second patch with conflict' \
'
'Push the second patch with conflict' \
'
- stg push bar
+
conflict_old
stg push bar
'
test_expect_success \
'
test_expect_success \
@@
-52,4
+52,19
@@
test_expect_success \
stg push --undo
'
stg push --undo
'
+test_expect_success \
+ 'Check the push after undo fails as well' \
+ '
+ conflict_old stg push bar
+ '
+
+test_expect_success \
+ 'Undo with disappeared newborn' \
+ '
+ touch newfile &&
+ git add newfile &&
+ rm newfile &&
+ stg push --undo
+ '
+
test_done
test_done