~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
squash: Make commit message editing more convenient
[stgit]
/
t
/
t0002-status.sh
diff --git
a/t/t0002-status.sh
b/t/t0002-status.sh
index
a030739
..
2512c53
100755
(executable)
--- a/
t/t0002-status.sh
+++ b/
t/t0002-status.sh
@@
-20,7
+20,7
@@
cat > expected.txt <<EOF
EOF
test_expect_success 'Run status on empty' '
stg status > output.txt &&
EOF
test_expect_success 'Run status on empty' '
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-29,7
+29,7
@@
EOF
test_expect_success 'Status with an untracked file' '
touch foo &&
stg status > output.txt &&
test_expect_success 'Status with an untracked file' '
touch foo &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
rm -f foo
'
rm -f foo
@@
-38,7
+38,7
@@
EOF
test_expect_success 'Status with an empty directory' '
mkdir foo &&
stg status > output.txt &&
test_expect_success 'Status with an empty directory' '
mkdir foo &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-47,16
+47,16
@@
EOF
test_expect_success 'Status with an untracked file in a subdir' '
touch foo/bar &&
stg status > output.txt &&
test_expect_success 'Status with an untracked file in a subdir' '
touch foo/bar &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
A foo/bar
EOF
test_expect_success 'Status with an added file' '
'
cat > expected.txt <<EOF
A foo/bar
EOF
test_expect_success 'Status with an added file' '
-
stg
add foo &&
+
git
add foo &&
stg status > output.txt &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-64,7
+64,7
@@
foo/bar
EOF
test_expect_success 'Status with an added file and -n option' '
stg status -n > output.txt &&
EOF
test_expect_success 'Status with an added file and -n option' '
stg status -n > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-73,7
+73,7
@@
test_expect_success 'Status after refresh' '
stg new -m "first patch" &&
stg refresh &&
stg status > output.txt &&
stg new -m "first patch" &&
stg refresh &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-82,7
+82,7
@@
EOF
test_expect_success 'Status after modification' '
echo "wee" >> foo/bar &&
stg status > output.txt &&
test_expect_success 'Status after modification' '
echo "wee" >> foo/bar &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-90,12
+90,12
@@
EOF
test_expect_success 'Status after refresh' '
stg new -m "second patch" && stg refresh &&
stg status > output.txt &&
test_expect_success 'Status after refresh' '
stg new -m "second patch" && stg refresh &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
test_expect_success 'Add another file' '
echo lajbans > fie &&
'
test_expect_success 'Add another file' '
echo lajbans > fie &&
-
stg
add fie &&
+
git
add fie &&
stg refresh
'
stg refresh
'
@@
-107,15
+107,13
@@
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' '
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
-
!
stg push &&
+
conflict
stg push &&
stg status > output.txt &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-123,7
+121,7
@@
C foo/bar
EOF
test_expect_success 'Status of file' '
stg status foo/bar > output.txt &&
EOF
test_expect_success 'Status of file' '
stg status foo/bar > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-131,32
+129,35
@@
C foo/bar
EOF
test_expect_success 'Status of dir' '
stg status foo > output.txt &&
EOF
test_expect_success 'Status of dir' '
stg status foo > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
+A fie
EOF
test_expect_success 'Status of other file' '
stg status fie > output.txt &&
EOF
test_expect_success 'Status of other file' '
stg status fie > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
+A fie
M foo/bar
EOF
test_expect_success 'Status after resolving the push' '
M foo/bar
EOF
test_expect_success 'Status after resolving the push' '
-
stg resolved -a
&&
+
git add --update
&&
stg status > output.txt &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
+A fie
D foo/bar
EOF
test_expect_success 'Status after deleting a file' '
rm foo/bar &&
stg status > output.txt &&
D foo/bar
EOF
test_expect_success 'Status after deleting a file' '
rm foo/bar &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-165,10
+166,10
@@
EOF
test_expect_success 'Status of disappeared newborn' '
stg refresh &&
touch foo/bar &&
test_expect_success 'Status of disappeared newborn' '
stg refresh &&
touch foo/bar &&
-
stg
add foo/bar &&
+
git
add foo/bar &&
rm foo/bar &&
stg status > output.txt &&
rm foo/bar &&
stg status > output.txt &&
-
diff -u
expected.txt output.txt
+
test_cmp
expected.txt output.txt
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
@@
-179,7
+180,13
@@
test_expect_success 'Status after renaming a file' '
git rm foo/bar &&
git mv fie fay &&
stg status > output.txt &&
git rm foo/bar &&
git mv fie fay &&
stg status > output.txt &&
- diff -u 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