chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the applied/unapplied commands
[stgit]
/
t
/
t3000-dirty-merge.sh
diff --git
a/t/t3000-dirty-merge.sh
b/t/t3000-dirty-merge.sh
index 4dd6da36af66730b3d5c412d83bfd51452432ae8..f0f79d5d6e740b6185151b96b831e5a0cb45827c 100755
(executable)
--- a/
t/t3000-dirty-merge.sh
+++ b/
t/t3000-dirty-merge.sh
@@
-24,11
+24,11
@@
test_expect_success 'Pop one patch and update the other' '
test_expect_success 'Push with dirty worktree' '
echo 4 > a &&
test_expect_success 'Push with dirty worktree' '
echo 4 > a &&
- [ "$(echo $(stg
applied
))" = "p1" ] &&
- [ "$(echo $(stg
unapplied
))" = "p2" ] &&
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p1" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "p2" ] &&
conflict stg goto p2 &&
conflict stg goto p2 &&
- [ "$(echo $(stg
applied
))" = "p1" ] &&
- [ "$(echo $(stg
unapplied
))" = "p2" ] &&
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p1" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "p2" ] &&
[ "$(echo $(cat a))" = "4" ]
'
[ "$(echo $(cat a))" = "4" ]
'