chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'kha/safe'
[stgit]
/
t
/
t2702-refresh-rm.sh
diff --git
a/t/t2702-refresh-rm.sh
b/t/t2702-refresh-rm.sh
index 896ebf39e2bcc7a10f3a4494ef5fd1a81db262a7..0362cc60211c775723b51d3dfcb6734e37552016 100755
(executable)
--- a/
t/t2702-refresh-rm.sh
+++ b/
t/t2702-refresh-rm.sh
@@
-28,7
+28,7
@@
cat > expected0.txt <<EOF
D y.txt
EOF
printf '' > expected1.txt
D y.txt
EOF
printf '' > expected1.txt
-test_expect_success 'git
-
rm a file' '
+test_expect_success 'git
rm a file' '
stg new -m p0 &&
git rm y.txt &&
stg status > status0.txt &&
stg new -m p0 &&
git rm y.txt &&
stg status > status0.txt &&
@@
-47,7
+47,7
@@
D y.txt
M x.txt
EOF
printf '' > expected1.txt
M x.txt
EOF
printf '' > expected1.txt
-test_expect_success 'git
-
rm a file together with other changes' '
+test_expect_success 'git
rm a file together with other changes' '
stg new -m p1 &&
echo x2 >> x.txt &&
git rm y.txt &&
stg new -m p1 &&
echo x2 >> x.txt &&
git rm y.txt &&