~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add range comparison support to stg-mdiff.
[stgit]
/
t
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index
7847a38
..
324b3b0
100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-21,20
+21,21
@@
test_create_repo foo
test_expect_success \
'Clone tree and setup changes' \
"stg clone foo bar &&
test_expect_success \
'Clone tree and setup changes' \
"stg clone foo bar &&
- (cd bar && stg new p1 -m p1
+ (cd bar && stg new p1 -m p1
&&
printf 'a\nc\n' > file && stg add file && stg refresh &&
printf 'a\nc\n' > file && stg add file && stg refresh &&
- stg new p2 -m p2
+ stg new p2 -m p2
&&
printf 'a\nb\nc\n' > file && stg refresh
)
"
test_expect_success \
'Port those patches to orig tree' \
printf 'a\nb\nc\n' > file && stg refresh
)
"
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' \