~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use / as separatar since it is common i branch names
[stgit]
/
t
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index
433e452
..
6769667
100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-30,11
+30,12
@@
test_expect_success \
test_expect_success \
'Port those patches to orig tree' \
test_expect_success \
'Port those patches to orig tree' \
- "(cd foo &&
- GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD |
+ '(cd foo &&
+ GIT_DIR=../bar/.git git-format-patch --stdout \
+ $(cd ../bar && stg id base@master)..HEAD |
git-am -3 -k
)
git-am -3 -k
)
-"
+ '
test_expect_success \
'Pull to sync with parent, preparing for the problem' \
test_expect_success \
'Pull to sync with parent, preparing for the problem' \
@@
-51,7
+52,7
@@
test_expect_failure \
test_expect_success \
'Rollback the push' \
test_expect_success \
'Rollback the push' \
- "(cd bar && stg
status --reset && stg
push --undo
+ "(cd bar && stg push --undo
)
"
)
"