~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Honor stgit-find-copies-harder in stgit-diff-range
[stgit]
/
t
/
t1202-push-undo.sh
diff --git
a/t/t1202-push-undo.sh
b/t/t1202-push-undo.sh
index
79439de
..
5afcf68
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 &&
-
git
add test &&
+
stg
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 &&
-
git
add test &&
+
stg
add test &&
stg refresh
'
stg refresh
'
@@
-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' \
'
- conflict
_old
stg push bar
+ conflict stg push bar
'
test_expect_success \
'
test_expect_success \
@@
-55,14
+55,14
@@
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' \
'
- conflict
_old
stg push bar
+ conflict stg push bar
'
test_expect_success \
'Undo with disappeared newborn' \
'
touch newfile &&
'
test_expect_success \
'Undo with disappeared newborn' \
'
touch newfile &&
-
git
add newfile &&
+
stg
add newfile &&
rm newfile &&
stg undo --hard
'
rm newfile &&
stg undo --hard
'