X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=3accb14f00b8d1b9cdcee1ca8eac34bd8e82e8ac;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=d8694121d6f56d6c087727e5d5f3615d9420c5b4;hpb=13ab4462d2aefb252d7c916bd537151856b7c967;p=git.git diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh old mode 100644 new mode 100755 index d8694121..3accb14f --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -26,7 +26,9 @@ test_expect_success \ 'git-diff-files -p after editing work tree.' \ 'git-diff-files -p >current' cat >expected <<\EOF -# mode: 100644 100755 path0 +diff --git a/path0 b/path0 +old mode 100644 +new mode 100755 --- a/path0 +++ b/path0 @@ -1,3 +1,3 @@ @@ -34,7 +36,8 @@ cat >expected <<\EOF Line 2 -line 3 +Line 3 -# mode: 100755 . path1 +diff --git a/path1 b/path1 +deleted file mode 100755 --- a/path1 +++ /dev/null @@ -1,3 +0,0 @@ @@ -47,4 +50,13 @@ test_expect_success \ 'validate git-diff-files -p output.' \ 'cmp -s current expected' +test_expect_success \ + 'build same diff using git-diff-helper.' \ + 'git-diff-files -z | git-diff-helper -z >current' + + +test_expect_success \ + 'validate git-diff-helper output.' \ + 'cmp -s current expected' + test_done