~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Populate the cached config options with the defaults
[stgit]
/
t
/
t2100-pull-policy-fetch.sh
diff --git
a/t/t2100-pull-policy-fetch.sh
b/t/t2100-pull-policy-fetch.sh
index
07435f5
..
670c7c6
100755
(executable)
--- a/
t/t2100-pull-policy-fetch.sh
+++ b/
t/t2100-pull-policy-fetch.sh
@@
-22,7
+22,7
@@
test_expect_success \
git config branch.master.stgit.pull-policy fetch-rebase &&
git config --list &&
stg new c1 -m c1 &&
git config branch.master.stgit.pull-policy fetch-rebase &&
git config --list &&
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
'