chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove an unnecessary parameter to make_patch_name
[stgit]
/
t
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index 7847a38dd186cfe69828339e24d5cf9e10c9014a..6769667fc6003945da33790b43cffb5802572949 100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-30,11
+30,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 |
+ '(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' \