~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
/
t1600-delete-one.sh
diff --git
a/t/t1600-delete-one.sh
b/t/t1600-delete-one.sh
index
c3451d8
..
f55bad6
100755
(executable)
--- a/
t/t1600-delete-one.sh
+++ b/
t/t1600-delete-one.sh
@@
-12,34
+12,34
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
git
add foo.txt &&
+
stg
add foo.txt &&
stg refresh
'
test_expect_success \
'Try to delete a non-existing patch' \
'
stg refresh
'
test_expect_success \
'Try to delete a non-existing patch' \
'
- [ $(stg
applied | wc -l
) -eq 1 ] &&
-
!
stg delete bar &&
- [ $(stg
applied | wc -l
) -eq 1 ]
+ [ $(stg
series --applied -c
) -eq 1 ] &&
+
command_error
stg delete bar &&
+ [ $(stg
series --applied -c
) -eq 1 ]
'
test_expect_success \
'Try to delete the topmost patch while dirty' \
'
echo dirty >> foo.txt &&
'
test_expect_success \
'Try to delete the topmost patch while dirty' \
'
echo dirty >> foo.txt &&
- [ $(stg
applied | wc -l
) -eq 1 ] &&
-
!
stg delete foo &&
- [ $(stg
applied | wc -l
) -eq 1 ] &&
+ [ $(stg
series --applied -c
) -eq 1 ] &&
+
command_error
stg delete foo &&
+ [ $(stg
series --applied -c
) -eq 1 ] &&
git reset --hard
'
test_expect_success \
'Delete the topmost patch' \
'
git reset --hard
'
test_expect_success \
'Delete the topmost patch' \
'
- [ $(stg
applied | wc -l
) -eq 1 ] &&
+ [ $(stg
series --applied -c
) -eq 1 ] &&
stg delete foo &&
stg delete foo &&
- [ $(stg
applied | wc -l
) -eq 0 ]
+ [ $(stg
series --applied -c
) -eq 0 ]
'
test_expect_success \
'
test_expect_success \
@@
-47,7
+47,7
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
git
add foo.txt &&
+
stg
add foo.txt &&
stg refresh &&
stg pop
'
stg refresh &&
stg pop
'
@@
-55,9
+55,9
@@
test_expect_success \
test_expect_success \
'Delete an unapplied patch' \
'
test_expect_success \
'Delete an unapplied patch' \
'
- [ $(stg
unapplied | wc -l
) -eq 1 ] &&
+ [ $(stg
series --unapplied -c
) -eq 1 ] &&
stg delete foo &&
stg delete foo &&
- [ $(stg
unapplied | wc -l
) -eq 0 ]
+ [ $(stg
series --unapplied -c
) -eq 0 ]
'
test_expect_success \
'
test_expect_success \
@@
-65,20
+65,20
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
git
add foo.txt &&
+
stg
add foo.txt &&
stg refresh &&
stg new bar -m bar &&
echo bar > bar.txt &&
stg refresh &&
stg new bar -m bar &&
echo bar > bar.txt &&
-
git
add bar.txt &&
+
stg
add bar.txt &&
stg refresh
'
test_expect_success \
'Try to delete a non-topmost applied patch' \
'
stg refresh
'
test_expect_success \
'Try to delete a non-topmost applied patch' \
'
- [ $(stg
applied | wc -l
) -eq 2 ] &&
+ [ $(stg
series --applied -c
) -eq 2 ] &&
stg delete foo &&
stg delete foo &&
- [ $(stg
applied | wc -l
) -eq 1 ]
+ [ $(stg
series --applied -c
) -eq 1 ]
'
test_expect_success \
'
test_expect_success \
@@
-87,23
+87,23
@@
test_expect_success \
stg branch --create br &&
stg new baz -m baz &&
echo baz > baz.txt &&
stg branch --create br &&
stg new baz -m baz &&
echo baz > baz.txt &&
-
git
add baz.txt &&
+
stg
add baz.txt &&
stg refresh &&
stg branch master &&
stg new baz -m baz &&
echo baz > baz.txt &&
stg refresh &&
stg branch master &&
stg new baz -m baz &&
echo baz > baz.txt &&
-
git
add baz.txt &&
+
stg
add baz.txt &&
stg refresh
'
test_expect_success \
'Delete a patch in another branch' \
'
stg refresh
'
test_expect_success \
'Delete a patch in another branch' \
'
- [ $(stg
applied | wc -l
) -eq 2 ] &&
- [ $(stg
applied -b br | wc -l
) -eq 1 ] &&
+ [ $(stg
series --applied -c
) -eq 2 ] &&
+ [ $(stg
series --applied -b br -c
) -eq 1 ] &&
stg delete -b br baz &&
stg delete -b br baz &&
- [ $(stg
applied | wc -l
) -eq 2 ] &&
- [ $(stg
applied -b br | wc -l
) -eq 0 ]
+ [ $(stg
series --applied -c
) -eq 2 ] &&
+ [ $(stg
series --applied -b br -c
) -eq 0 ]
'
test_done
'
test_done