~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stg series: Explain the list format better
[stgit]
/
t
/
t1300-uncommit.sh
diff --git
a/t/t1300-uncommit.sh
b/t/t1300-uncommit.sh
index
4a955f6
..
43e0d04
100755
(executable)
--- a/
t/t1300-uncommit.sh
+++ b/
t/t1300-uncommit.sh
@@
-42,7
+42,7
@@
test_expect_success \
'Uncommit the patches using names' \
'
stg uncommit bar foo &&
'Uncommit the patches using names' \
'
stg uncommit bar foo &&
- [ "$(stg id foo
//top)" = "$(stg id bar//bottom
)" ] &&
+ [ "$(stg id foo
)" = "$(stg id bar^
)" ] &&
stg commit --all
'
stg commit --all
'
@@
-50,7
+50,7
@@
test_expect_success \
'Uncommit the patches using prefix' \
'
stg uncommit --number=2 foobar &&
'Uncommit the patches using prefix' \
'
stg uncommit --number=2 foobar &&
- [ "$(stg id foobar1
//top)" = "$(stg id foobar2//bottom
)" ] &&
+ [ "$(stg id foobar1
)" = "$(stg id foobar2^
)" ] &&
stg commit --all
'
stg commit --all
'
@@
-58,7
+58,7
@@
test_expect_success \
'Uncommit the patches using auto names' \
'
stg uncommit --number=2 &&
'Uncommit the patches using auto names' \
'
stg uncommit --number=2 &&
- [ "$(stg id foo-patch
//top)" = "$(stg id bar-patch//bottom
)" ] &&
+ [ "$(stg id foo-patch
)" = "$(stg id bar-patch^
)" ] &&
stg commit --all
'
stg commit --all
'
@@
-67,14
+67,14
@@
test_expect_success \
'
stg uncommit &&
stg uncommit &&
'
stg uncommit &&
stg uncommit &&
- [ "$(stg id foo-patch
//top)" = "$(stg id bar-patch//bottom
)" ] &&
+ [ "$(stg id foo-patch
)" = "$(stg id bar-patch^
)" ] &&
stg commit --all
'
test_expect_success \
'Uncommit the patches with --to' '
stg uncommit --to HEAD^ &&
stg commit --all
'
test_expect_success \
'Uncommit the patches with --to' '
stg uncommit --to HEAD^ &&
- [ "$(stg id foo-patch
//top)" = "$(stg id bar-patch//bottom
)" ] &&
+ [ "$(stg id foo-patch
)" = "$(stg id bar-patch^
)" ] &&
stg commit --all
'
stg commit --all
'