stg new p$i -m p$i &&
echo x$i >> x.txt &&
echo y$i >> foo/y.txt &&
- stg add x.txt foo/y.txt &&
+ git add x.txt foo/y.txt &&
stg refresh
done &&
[ "$(echo $(stg applied))" = "p0 p1 p2" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
stg new extra -m extra &&
echo extra >> extra.txt &&
- stg add extra.txt &&
+ git add extra.txt &&
stg refresh &&
cd foo &&
stg push &&
[ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
'
-test_expect_failure 'Conflicting push from subdir' '
+test_expect_success 'Conflicting push from subdir' '
stg pop p1 p2 &&
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
stg new foo -m foo &&
mkdir d &&
echo foo > d/test &&
- stg add d/test &&
+ git add d/test &&
stg refresh &&
stg pop &&
mkdir -p d &&