~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log subprocess calls during performance testing
[stgit]
/
t
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index
cfec696
..
6ebd0a1
100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-23,7
+23,7
@@
test_expect_success \
stg clone foo bar &&
(
cd bar && stg new p1 -m p1 &&
stg clone foo bar &&
(
cd bar && stg new p1 -m p1 &&
- printf "a\nc\n" > file &&
stg
add 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" ] &&
stg new p2 -m p2 &&
printf "a\nb\nc\n" > file && stg refresh &&
[ "$(echo $(stg applied))" = "p1 p2" ] &&
@@
-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
)
"
)
"