~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repository.rev_parse: support commits, trees, and blobs
[stgit]
/
t
/
t1205-push-subdir.sh
diff --git
a/t/t1205-push-subdir.sh
b/t/t1205-push-subdir.sh
index
f852762
..
4af63ce
100755
(executable)
--- a/
t/t1205-push-subdir.sh
+++ b/
t/t1205-push-subdir.sh
@@
-9,7
+9,7
@@
test_expect_success 'Create some patches' '
stg new p$i -m p$i &&
echo x$i >> x.txt &&
echo y$i >> foo/y.txt &&
stg new p$i -m p$i &&
echo x$i >> x.txt &&
echo y$i >> foo/y.txt &&
-
git
add x.txt foo/y.txt &&
+
stg
add x.txt foo/y.txt &&
stg refresh
done &&
[ "$(echo $(stg series --applied --noprefix))" = "p0 p1 p2" ] &&
stg refresh
done &&
[ "$(echo $(stg series --applied --noprefix))" = "p0 p1 p2" ] &&
@@
-33,7
+33,7
@@
test_expect_success 'Modifying push from a subdir' '
[ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
stg new extra -m extra &&
echo extra >> extra.txt &&
[ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
stg new extra -m extra &&
echo extra >> extra.txt &&
-
git
add extra.txt &&
+
stg
add extra.txt &&
stg refresh &&
cd foo &&
stg push &&
stg refresh &&
cd foo &&
stg push &&
@@
-47,7
+47,7
@@
test_expect_success 'Conflicting push from subdir' '
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
cd foo &&
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
cd foo &&
- conflict
_old
stg push p2 &&
+ conflict stg push p2 &&
cd .. &&
[ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
'
cd .. &&
[ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
'
@@
-57,7
+57,7
@@
test_expect_success 'Conflicting add/unknown file in subdir' '
stg new foo -m foo &&
mkdir d &&
echo foo > d/test &&
stg new foo -m foo &&
mkdir d &&
echo foo > d/test &&
-
git
add d/test &&
+
stg
add d/test &&
stg refresh &&
stg pop &&
mkdir -p d &&
stg refresh &&
stg pop &&
mkdir -p d &&