~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
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index
ba4f70c
..
35c9bdd
100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-26,8
+26,8
@@
test_expect_success \
printf "a\nc\n" > file && git add file && stg refresh &&
stg new p2 -m p2 &&
printf "a\nb\nc\n" > file && stg refresh &&
printf "a\nc\n" > file && git add file && stg refresh &&
stg new p2 -m p2 &&
printf "a\nb\nc\n" > file && stg refresh &&
- [ "$(echo $(stg
applied
))" = "p1 p2" ] &&
- [ "$(echo $(stg
unapplied
))" = "" ]
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p1 p2" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "" ]
)
'
)
'
@@
-35,8
+35,8
@@
test_expect_success \
'Port those patches to orig tree' '
(
cd foo &&
'Port those patches to orig tree' '
(
cd foo &&
- GIT_DIR=../bar/.git git
-
format-patch --stdout \
- $(cd ../bar && stg id
base@master)..HEAD | git-
am -3 -k
+ GIT_DIR=../bar/.git git
format-patch --stdout \
+ $(cd ../bar && stg id
master:{base})..HEAD | git
am -3 -k
)
'
)
'
@@
-49,7
+49,7
@@
test_expect_success \
test_expect_success \
'Attempt to push the first of those patches without --merged' \
test_expect_success \
'Attempt to push the first of those patches without --merged' \
- "(cd bar &&
!
stg push
+ "(cd bar &&
conflict_old
stg push
)
"
)
"
@@
-57,8
+57,8
@@
test_expect_success \
'Rollback the push' '
(
cd bar && stg push --undo &&
'Rollback the push' '
(
cd bar && stg push --undo &&
- [ "$(echo $(stg
applied
))" = "" ] &&
- [ "$(echo $(stg
unapplied
))" = "p1 p2" ]
+ [ "$(echo $(stg
series --applied --noprefix
))" = "" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "p1 p2" ]
)
'
)
'
@@
-66,8
+66,8
@@
test_expect_success \
'Push those patches while checking they were merged upstream' '
(
cd bar && stg push --merged --all
'Push those patches while checking they were merged upstream' '
(
cd bar && stg push --merged --all
- [ "$(echo $(stg
applied
))" = "p1 p2" ] &&
- [ "$(echo $(stg
unapplied
))" = "" ]
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p1 p2" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "" ]
)
'
)
'