chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that stg uncommit doesn't touch the branch head
[stgit]
/
t
/
t1300-uncommit.sh
diff --git
a/t/t1300-uncommit.sh
b/t/t1300-uncommit.sh
index d01eaaa9f90f103c027ae4d940f81d4825e8b554..4a955f643ef7820031a1639d19ab1e96452f2b67 100755
(executable)
--- a/
t/t1300-uncommit.sh
+++ b/
t/t1300-uncommit.sh
@@
-85,7
+85,7
@@
test_expect_success 'Uncommit a commit with not precisely one parent' '
# stg uncommit should work even when top != head, and should not touch
# the head.
# stg uncommit should work even when top != head, and should not touch
# the head.
-test_expect_
failure
'Uncommit when top != head' '
+test_expect_
success
'Uncommit when top != head' '
stg new -m foo &&
git reset --hard HEAD^ &&
h=$(git rev-parse HEAD)
stg new -m foo &&
git reset --hard HEAD^ &&
h=$(git rev-parse HEAD)