~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Refactor: use mapc to set all local variables in stgit-mode
[stgit]
/
t
/
t3100-reset.sh
diff --git
a/t/t3100-reset.sh
b/t/t3100-reset.sh
index
0b5cd2c
..
61f303d
100755
(executable)
--- a/
t/t3100-reset.sh
+++ b/
t/t3100-reset.sh
@@
-12,7
+12,7
@@
EOF
test_expect_success 'Initialize StGit stack with three patches' '
stg init &&
echo 000 >> a &&
test_expect_success 'Initialize StGit stack with three patches' '
stg init &&
echo 000 >> a &&
-
git
add a &&
+
stg
add a &&
git commit -m a &&
echo 111 >> a &&
git commit -a -m p1 &&
git commit -m a &&
echo 111 >> a &&
git commit -a -m p1 &&
@@
-152,7
+152,7
@@
cat > expected.txt <<EOF
222
EOF
test_expect_success '... and undo the refresh' '
222
EOF
test_expect_success '... and undo the refresh' '
- stg reset master.stgit^~
1
&&
+ stg reset master.stgit^~
2
&&
test "$(echo $(stg series --all))" = "+ p1 > p2" &&
test_cmp expected.txt a
'
test "$(echo $(stg series --all))" = "+ p1 > p2" &&
test_cmp expected.txt a
'