*** empty log message ***

1 files changed, 19 insertions, 4 deletions

diff --git a/tests/cp/same-file b/tests/cp/same-file
index 597bfa4d4..8d3533e71 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -25,7 +25,7 @@ exec 1> $actual
 
 contents=XYZ
 for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do
-  for options in '' -b -d -bd -bdf; do
+  for options in '' -d -f -df -b -bd -bf -bdf; do
     rm -rf dir
     mkdir dir
     cd dir
@@ -68,32 +68,47 @@ done
 
 cat <<\EOF > $expected
 1 [cp: `foo' and `symlink' are the same file] (foo symlink -> foo)
-0 (foo symlink symlink.~1~ -> foo)
+1 [cp: `foo' and `symlink' are the same file] (foo symlink -> foo)
+1 [cp: `foo' and `symlink' are the same file] (foo symlink -> foo)
 1 [cp: `foo' and `symlink' are the same file] (foo symlink -> foo)
 0 (foo symlink symlink.~1~ -> foo)
 0 (foo symlink symlink.~1~ -> foo)
+0 (foo symlink symlink.~1~ -> foo)
+0 (foo symlink symlink.~1~ -> foo)
 
 1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
 1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
 1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
+1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
+1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
 0 (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop
+1 [cp: `symlink' and `foo' are the same file] (foo symlink -> foo)
 0 (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop
 
 1 [cp: `foo' and `foo' are the same file] (foo)
 1 [cp: `foo' and `foo' are the same file] (foo)
 1 [cp: `foo' and `foo' are the same file] (foo)
 1 [cp: `foo' and `foo' are the same file] (foo)
+1 [cp: `foo' and `foo' are the same file] (foo)
+1 [cp: `foo' and `foo' are the same file] (foo)
+0 (foo foo.~1~)
 0 (foo foo.~1~)
 
 1 [cp: `sl1' and `sl2' are the same file] (foo sl1 -> foo sl2 -> foo)
-0 (foo sl1 -> foo sl2 sl2.~1~ -> foo)
 1 [cp: `sl1' and `sl2' are the same file] (foo sl1 -> foo sl2 -> foo)
+1 [cp: `sl1' and `sl2' are the same file] (foo sl1 -> foo sl2 -> foo)
+1 [cp: `sl1' and `sl2' are the same file] (foo sl1 -> foo sl2 -> foo)
+0 (foo sl1 -> foo sl2 sl2.~1~ -> foo)
 0 (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo)
+0 (foo sl1 -> foo sl2 sl2.~1~ -> foo)
 0 (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo)
 
 1 [cp: `foo' and `hardlink' are the same file] (foo hardlink)
-0 (foo hardlink hardlink.~1~)
 1 [cp: `foo' and `hardlink' are the same file] (foo hardlink)
+1 [cp: `foo' and `hardlink' are the same file] (foo hardlink)
+1 [cp: `foo' and `hardlink' are the same file] (foo hardlink)
+0 (foo hardlink hardlink.~1~)
+0 (foo hardlink hardlink.~1~)
 0 (foo hardlink hardlink.~1~)
 0 (foo hardlink hardlink.~1~)