~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Repair ! for historical commits
[stgit]
/
t
/
t1201-pull-trailing.sh
diff --git
a/t/t1201-pull-trailing.sh
b/t/t1201-pull-trailing.sh
index
42c6619
..
a993aeb
100755
(executable)
--- a/
t/t1201-pull-trailing.sh
+++ b/
t/t1201-pull-trailing.sh
@@
-18,7
+18,7
@@
test_create_repo foo
test_expect_success \
'Setup and clone tree, and setup changes' \
"(cd foo &&
test_expect_success \
'Setup and clone tree, and setup changes' \
"(cd foo &&
- printf 'a\nb\n' > file &&
git
add file && git commit -m .
+ printf 'a\nb\n' > file &&
stg
add file && git commit -m .
) &&
stg clone foo bar &&
(cd bar && stg new p1 -m p1
) &&
stg clone foo bar &&
(cd bar && stg new p1 -m p1
@@
-28,11
+28,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 |
- git-am -3 -k
+ '(cd foo &&
+ GIT_DIR=../bar/.git git format-patch --stdout \
+ $(cd ../bar && stg id master:{base})..HEAD |
+ git am -3 -k
)
)
-"
+ '
test_expect_success \
'Pull those patches applied upstream, without pushing' \
test_expect_success \
'Pull those patches applied upstream, without pushing' \
@@
-48,13
+49,13
@@
test_expect_success \
test_expect_success \
'Pull those patches applied upstream' \
test_expect_success \
'Pull those patches applied upstream' \
- "(cd bar && stg
push --
undo && stg push --all --merged
+ "(cd bar && stg undo && stg push --all --merged
)
"
test_expect_success \
'Check that all went well' \
)
"
test_expect_success \
'Check that all went well' \
- "
diff -u
foo/file bar/file
+ "
test_cmp
foo/file bar/file
"
test_done
"
test_done