~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Emacs mode: use "stg new --file"
[stgit]
/
t
/
t2101-pull-policy-pull.sh
diff --git
a/t/t2101-pull-policy-pull.sh
b/t/t2101-pull-policy-pull.sh
index
793491c
..
ce4b5c8
100755
(executable)
--- a/
t/t2101-pull-policy-pull.sh
+++ b/
t/t2101-pull-policy-pull.sh
@@
-19,10
+19,10
@@
test_expect_success \
(cd upstream && stg init) &&
stg clone upstream clone &&
(cd clone &&
(cd upstream && stg init) &&
stg clone upstream clone &&
(cd clone &&
- git
repo-
config branch.master.stgit.pull-policy pull &&
- git
repo-
config --list &&
+ git config branch.master.stgit.pull-policy pull &&
+ git config --list &&
stg new c1 -m c1 &&
stg new c1 -m c1 &&
- echo a > file &&
stg
add file && stg refresh
+ echo a > file &&
git
add file && stg refresh
)
'
)
'
@@
-30,7
+30,7
@@
test_expect_success \
'Add non-rewinding commit upstream and pull it from clone' \
'
(cd upstream && stg new u1 -m u1 &&
'Add non-rewinding commit upstream and pull it from clone' \
'
(cd upstream && stg new u1 -m u1 &&
- echo a > file2 &&
stg
add file2 && stg refresh) &&
+ echo a > file2 &&
git
add file2 && stg refresh) &&
(cd clone && stg pull) &&
test -e clone/file2
'
(cd clone && stg pull) &&
test -e clone/file2
'
@@
-39,11
+39,11
@@
test_expect_success \
# as rewinding, and thus heads/origin is not moved, but the stack
# is still correctly rebased
# as rewinding, and thus heads/origin is not moved, but the stack
# is still correctly rebased
-test_expect_
failure
\
+test_expect_
success
\
'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
'
(cd upstream && echo b >> file2 && stg refresh) &&
'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
'
(cd upstream && echo b >> file2 && stg refresh) &&
- (cd clone && stg pull)
+ (cd clone &&
!
stg pull)
'
test_expect_success \
'
test_expect_success \