1303 files changed, 32187 insertions, 57138 deletions
diff --git a/testsuite/diff.tests b/testsuite/diff.tests index 6de4648..0ced0f2 100755 --- a/testsuite/diff.tests +++ b/testsuite/diff.tests @@ -44,6 +44,17 @@ testing "diff of stdin, twice" \ "" \ "stdin" +testing "diff of empty file against stdin" \ + "diff -u - input | $TRIM_TAB" \ +"\ +--- - ++++ input +@@ -1 +0,0 @@ +-a +" \ + "" \ + "a\n" + testing "diff of empty file against nonempty one" \ "diff -u - input | $TRIM_TAB" \ "\ @@ -87,6 +98,18 @@ testing "diff -B does not ignore changes whose lines are not all blank" \ "a\n" \ "\nb\n\n" +testing "diff -B ignores blank single line change" \ + 'diff -qB - input; echo $?' \ + "0\n" \ + "\n1\n" \ + "1\n" + +testing "diff -B does not ignore non-blank single line change" \ + 'diff -qB - input; echo $?' \ + "Files - and input differ\n1\n" \ + "0\n" \ + "1\n" + testing "diff always takes context from old file" \ "diff -ub - input | $TRIM_TAB" \ "\ |