~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Make "C-u r" raise error if run with prefix argument without a patch
[stgit]
/
t
/
t2200-rebase.sh
diff --git
a/t/t2200-rebase.sh
b/t/t2200-rebase.sh
index
a6f43bc
..
75e1f17
100755
(executable)
--- a/
t/t2200-rebase.sh
+++ b/
t/t2200-rebase.sh
@@
-11,10
+11,10
@@
test_expect_success \
'Setup a multi-commit branch and fork an stgit stack' \
'
echo foo > file1 &&
'Setup a multi-commit branch and fork an stgit stack' \
'
echo foo > file1 &&
-
git
add file1 &&
+
stg
add file1 &&
git commit -m a &&
echo foo > file2 &&
git commit -m a &&
echo foo > file2 &&
-
git
add file2 &&
+
stg
add file2 &&
git commit -m b &&
stg branch --create stack &&
git commit -m b &&
stg branch --create stack &&
@@
-27,8
+27,8
@@
test_expect_success \
'Rebase to previous commit' \
'
stg rebase master~1 &&
'Rebase to previous commit' \
'
stg rebase master~1 &&
- test `stg id
base@stack
` = `git rev-parse master~1` &&
- test `stg
applied | wc -l
` = 1
+ test `stg id
stack:{base}
` = `git rev-parse master~1` &&
+ test `stg
series --applied -c
` = 1
'
test_expect_success \
'
test_expect_success \
@@
-40,7
+40,7
@@
test_expect_success \
test_expect_success \
'Check patches were re-applied' \
'
test_expect_success \
'Check patches were re-applied' \
'
- test $(stg
applied | wc -l
) = 1
+ test $(stg
series --applied -c
) = 1
'
test_done
'
test_done