~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track the files conflict history
[stgit]
/
t
/
t1400-patch-history.sh
diff --git
a/t/t1400-patch-history.sh
b/t/t1400-patch-history.sh
index
cabd5e8
..
34162f4
100755
(executable)
--- a/
t/t1400-patch-history.sh
+++ b/
t/t1400-patch-history.sh
@@
-69,8
+69,19
@@
test_expect_success \
'
test_expect_success \
'
test_expect_success \
+ 'Check the "push(c)" log' \
+ '
+ echo bar > test && stg refresh &&
+ stg pop &&
+ echo foo > test && stg refresh &&
+ ! stg push &&
+ stg log | grep -q -e "^push(c) "
+ '
+
+test_expect_success \
'Check the push "undo" log' \
'
'Check the push "undo" log' \
'
+ stg status --reset &&
stg push --undo &&
stg log bar | grep -q -e "^undo "
'
stg push --undo &&
stg log bar | grep -q -e "^undo "
'