~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement a new patch identification scheme and id command
[stgit]
/
t
/
t1200-push-modified.sh
diff --git
a/t/t1200-push-modified.sh
b/t/t1200-push-modified.sh
index
ba4f70c
..
2edc760
100755
(executable)
--- a/
t/t1200-push-modified.sh
+++ b/
t/t1200-push-modified.sh
@@
-36,7
+36,7
@@
test_expect_success \
(
cd foo &&
GIT_DIR=../bar/.git git-format-patch --stdout \
(
cd foo &&
GIT_DIR=../bar/.git git-format-patch --stdout \
- $(cd ../bar && stg id
base@master
)..HEAD | git-am -3 -k
+ $(cd ../bar && stg id
master:{base}
)..HEAD | git-am -3 -k
)
'
)
'
@@
-49,7
+49,7
@@
test_expect_success \
test_expect_success \
'Attempt to push the first of those patches without --merged' \
test_expect_success \
'Attempt to push the first of those patches without --merged' \
- "(cd bar &&
!
stg push
+ "(cd bar &&
conflict_old
stg push
)
"
)
"