~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert "pop" to the lib infrastructure
[stgit]
/
t
/
t0002-status.sh
diff --git
a/t/t0002-status.sh
b/t/t0002-status.sh
index
5e1e8ca
..
d95a83b
100755
(executable)
--- a/
t/t0002-status.sh
+++ b/
t/t0002-status.sh
@@
-107,14
+107,11
@@
test_expect_success 'Make a conflicting patch' '
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
-? foo/bar.ancestor
-? foo/bar.current
-? foo/bar.patched
A fie
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
A fie
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
-
!
stg push &&
+
conflict_old
stg push &&
stg status > output.txt &&
test_cmp expected.txt output.txt
'
stg status > output.txt &&
test_cmp expected.txt output.txt
'
@@
-186,4
+183,10
@@
test_expect_success 'Status after renaming a file' '
test_cmp expected.txt output.txt
'
test_cmp expected.txt output.txt
'
+test_expect_success 'Status after renaming a file (with rename detection)' '
+ git config stgit.diff-opts -M &&
+ stg status > output.txt &&
+ test_cmp expected.txt output.txt
+'
+
test_done
test_done