commit - 3eada727868aaa9cde33edc9bc9cbf248f9af3b0
commit + 8d301dd94ca3964729aa83b8031e7502a1111f49
blob - ddbaf4a87665ff09850e0cb12679e18bb8b07138
blob + da716a3db5a59725b149f466b4ee42fbe4b82d12
--- regress/cmdline/add.sh
+++ regress/cmdline/add.sh
echo 'A foo' > $testroot/stdout.expected
(cd $testroot/wt && got add foo > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "A baz" >> $testroot/stdout.expected
echo "A foo" >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - 3123aa962f92c77f4df878cb009b10d7a0267610
blob + 5ddd473dfa87ec48c9de2af60e5d77fdf26a9842
--- regress/cmdline/checkout.sh
+++ regress/cmdline/checkout.sh
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
cat $testroot/wt/alpha $testroot/wt/beta $testroot/wt/epsilon/zeta \
$testroot/wt/gamma/delta > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - 668767cbe1dbdf3fe334cf8a4f899fee4116bb5c
blob + 454a2907eb42bfb61730e321b0e5e7d55abf7901
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
echo "D beta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "A d/new2" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "M epsilon/zeta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "M epsilon/zeta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "got: work tree must be updated before these" \
"changes can be committed" > $testroot/stderr.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
return 1
fi
- cmp $testroot/stderr.expected $testroot/stderr
+ cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
blob - a41a7e7b89425d5dab35003ae2f70510871dc005
blob + 9193624ff0a715ee9b6277aa6ffaa68cbcd8f4de
--- regress/cmdline/diff.sh
+++ regress/cmdline/diff.sh
echo '+new file' >> $testroot/stdout.expected
(cd $testroot/wt && got diff > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got diff > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - a5272f0679c901661f2534ddda6379d6a402314d
blob + 11f0724fc95a705812f15b4d42b2e204fbaebb8f
--- regress/cmdline/log.sh
+++ regress/cmdline/log.sh
for p in "" "." alpha epsilon epsilon/zeta; do
(cd $testroot/repo && got log $p | \
grep ^commit > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
for p in "" "." zeta; do
(cd $testroot/repo/epsilon && got log $p | \
grep ^commit > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
for p in "" "." alpha epsilon epsilon/zeta; do
(cd $testroot/repo/.git && got log $p | \
grep ^commit > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
for p in "" "." alpha epsilon; do
(cd $testroot/wt && got log $p | \
grep ^commit > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
for p in "" "." zeta; do
(cd $testroot/wt/epsilon && got log $p | \
grep ^commit > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - 4c59fbdebed9af30db2c55f99c3b569c552e8c31
blob + 584c34ece375b5bcf37239b7a0182a3c669c81a2
--- regress/cmdline/revert.sh
+++ regress/cmdline/revert.sh
(cd $testroot/wt && got revert alpha > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "alpha" > $testroot/content.expected
cat $testroot/wt/alpha > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got revert beta > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "beta" > $testroot/content.expected
cat $testroot/wt/beta > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got revert new > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "new file" > $testroot/content.expected
cat $testroot/wt/new > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - e0f866bb327f00e152a18a34b9ceade7e5a69655
blob + bb717cac07e1b3f367f8a6d63f607e748587f356
--- regress/cmdline/rm.sh
+++ regress/cmdline/rm.sh
echo 'D beta' > $testroot/stdout.expected
(cd $testroot/wt && got rm beta > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo 'got: file contains modifications' > $testroot/stderr.expected
(cd $testroot/wt && got rm beta 2>$testroot/stderr)
- cmp $testroot/stderr.expected $testroot/stderr
+ cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
echo 'D beta' > $testroot/stdout.expected
(cd $testroot/wt && got rm -f beta > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - 6153d36c2d585a109a3c72d16d412dda24c7d84e
blob + 4829d1e981ef5182075703688d560e43f0e94747
--- regress/cmdline/status.sh
+++ regress/cmdline/status.sh
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# ? Basic/Targets.cpp
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# ? Frontend/Rewrite/CMakeLists.txt
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$?" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# ? ramdisk_cd/list.local
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
blob - 00c8418960dd9b88696917d8441bb984e4f94d46
blob + 3c6429593ca295ae154c301420e7717af1201161
--- regress/cmdline/update.sh
+++ regress/cmdline/update.sh
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "modified alpha" > $testroot/content.expected
cat $testroot/wt/alpha > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "new" >> $testroot/content.expected
cat $testroot/wt/gamma/new > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$?" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# A epsilon2/mu <--- not intended
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
cat $testroot/wt/beta >> $testroot/content
cat $testroot/wt/numbers >> $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
return 1
fi
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo >> $testroot/stdout.expected
(cd $testroot/wt && got update > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
cat $testroot/wt/alpha > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
echo -n "Updated to commit " >> $testroot/stdout.expected
git_show_head $testroot/repo >> $testroot/stdout.expected
echo >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
cat $testroot/wt/gamma/new > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
echo "new and also new" > $testroot/wt/gamma/new
echo 'M gamma/new' > $testroot/stdout.expected
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo -n "Updated to commit " >> $testroot/stdout.expected
git_show_head $testroot/repo >> $testroot/stdout.expected
echo >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
cat $testroot/wt/beta > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
# beta is now an added file... we don't flag tree conflicts yet
echo 'A beta' > $testroot/stdout.expected
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo -n "Updated to commit " >> $testroot/stdout.expected
git_show_head $testroot/repo >> $testroot/stdout.expected
echo >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# beta remains a deleted file... we don't flag tree conflicts yet
echo 'D beta' > $testroot/stdout.expected
(cd $testroot/wt && got status > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo '-modified beta' >> $testroot/stdout.expected
(cd $testroot/wt && got diff > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo -n "Updated to commit " >> $testroot/stdout.expected
git_show_head $testroot/repo >> $testroot/stdout.expected
echo >> $testroot/stdout.expected
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
# beta is now gone... we don't flag tree conflicts yet
echo 'got: bad path' > $testroot/stderr.expected
(cd $testroot/wt && got status beta 2> $testroot/stderr)
- cmp $testroot/stderr.expected $testroot/stderr
+ cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
(cd $testroot/wt && got update $f > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "modified $f" > $testroot/content.expected
cat $testroot/wt/$f > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got update $f > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "$f" > $testroot/content.expected
cat $testroot/wt/$f > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
return 1
fi
- cmp $testroot/stderr.expected $testroot/stderr
+ cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
(cd $testroot/wt && got update epsilon > $testroot/stdout)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
echo "modified epsilon/zeta" > $testroot/content.expected
cat $testroot/wt/epsilon/zeta > $testroot/content
- cmp $testroot/content.expected $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/content.expected $testroot/content
(cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
- cmp $testroot/stdout.expected $testroot/stdout
+ cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
return 1
fi
- cmp $testroot/stderr.expected $testroot/stderr
+ cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr