~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable'
[stgit]
/
t
/
t1600-delete-one.sh
diff --git
a/t/t1600-delete-one.sh
b/t/t1600-delete-one.sh
index
d59d4ba
..
3052b3a
100755
(executable)
--- a/
t/t1600-delete-one.sh
+++ b/
t/t1600-delete-one.sh
@@
-12,7
+12,7
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
stg
add foo.txt &&
+
git
add foo.txt &&
stg refresh
'
stg refresh
'
@@
-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 &&
-
stg
add foo.txt &&
+
git
add foo.txt &&
stg refresh &&
stg pop
'
stg refresh &&
stg pop
'
@@
-65,11
+65,11
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
stg
add foo.txt &&
+
git
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 &&
-
stg
add bar.txt &&
+
git
add bar.txt &&
stg refresh
'
stg refresh
'
@@
-82,36
+82,27
@@
test_expect_success \
'
test_expect_success \
'
test_expect_success \
- 'Hide the topmost patch and try to delete it' \
- '
- [ $(stg applied | wc -l) -eq 2 ] &&
- stg hide bar &&
- stg delete bar &&
- [ $(stg applied | wc -l) -eq 1 ]
- '
-
-test_expect_success \
'Create another branch, and put one patch in each branch' \
'
stg branch --create br &&
stg new baz -m baz &&
echo baz > baz.txt &&
'Create another branch, and put one patch in each branch' \
'
stg branch --create br &&
stg new baz -m baz &&
echo baz > baz.txt &&
-
stg
add baz.txt &&
+
git
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 &&
-
stg
add baz.txt &&
+
git
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 | wc -l) -eq
3
] &&
[ $(stg applied -b br | wc -l) -eq 1 ] &&
stg delete -b br baz &&
[ $(stg applied -b br | wc -l) -eq 1 ] &&
stg delete -b br baz &&
- [ $(stg applied | wc -l) -eq
2
] &&
+ [ $(stg applied | wc -l) -eq
3
] &&
[ $(stg applied -b br | wc -l) -eq 0 ]
'
[ $(stg applied -b br | wc -l) -eq 0 ]
'