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 &&
- 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' \
- "(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
)
-"
+ '
test_expect_success \
'Pull to sync with parent, preparing for the problem' \