diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-20 23:24:39 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-22 01:54:13 -0700 |
commit | 5cfcd07c931e6029a77f9393309f7d0ec7cdc118 (patch) | |
tree | 02ff16ec4156147c6a9b744033259d5c867837e4 /t | |
parent | Retire rev-tree. (diff) | |
download | tgif-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.tar.xz |
Retire diff-helper.
The textual diff generation with built-in '-p' in diff-* brothers has
proven to be useful enough that git-diff-helper outlived its usefulness.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-x | t/t4000-diff-format.sh | 9 | ||||
-rwxr-xr-x | t/t4005-diff-rename-2.sh | 80 | ||||
-rwxr-xr-x | t/t4009-diff-rename-4.sh | 80 |
3 files changed, 0 insertions, 169 deletions
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index 91015d76fc..f3b6330a9b 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -50,13 +50,4 @@ 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 diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 5636f4f2cd..684fd23a41 100755 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -40,38 +40,6 @@ test_expect_success \ 'validate output from rename/copy detection (#1)' \ 'compare_diff_raw current expected' -# make sure diff-helper can grok it. -mv expected diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -diff --git a/COPYING b/COPYING.2 -rename from COPYING -rename to COPYING.2 ---- a/COPYING -+++ b/COPYING.2 -@@ -2 +2 @@ -- Note that the only valid version of the GPL as far as this project -+ Note that the only valid version of the G.P.L as far as this project -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like -@@ -12 +12 @@ -- This file is licensed under the GPL v2, or a later version -+ This file is licensed under the G.P.L v2, or a later version -EOF - -test_expect_success \ - 'validate output from diff-helper (#1)' \ - 'compare_diff_patch current expected' - ################################################################ test_expect_success \ @@ -94,36 +62,6 @@ test_expect_success \ 'validate output from rename/copy detection (#2)' \ 'compare_diff_raw current expected' -# make sure diff-helper can grok it. -mv expected diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING ---- a/COPYING -+++ b/COPYING -@@ -2 +2 @@ -- Note that the only valid version of the GPL as far as this project -+ Note that the only valid version of the G.P.L as far as this project -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like -@@ -12 +12 @@ -- This file is licensed under the GPL v2, or a later version -+ This file is licensed under the G.P.L v2, or a later version -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -EOF - -test_expect_success \ - 'validate output from diff-helper (#2)' \ - 'compare_diff_patch current expected' - ################################################################ # tree has COPYING and rezrov. work tree has the same COPYING and @@ -145,22 +83,4 @@ test_expect_success \ 'validate output from rename/copy detection (#3)' \ 'compare_diff_raw current expected' -# make sure diff-helper can grok it. -mv expected diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -EOF - -test_expect_success \ - 'validate output from diff-helper (#3)' \ - 'compare_diff_patch current expected' - test_done diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh index ea811529cc..2f2f8b1216 100755 --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -44,38 +44,6 @@ test_expect_success \ 'validate output from rename/copy detection (#1)' \ 'compare_diff_raw_z current expected' -# make sure diff-helper can grok it. -mv current diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -diff --git a/COPYING b/COPYING.2 -rename from COPYING -rename to COPYING.2 ---- a/COPYING -+++ b/COPYING.2 -@@ -2 +2 @@ -- Note that the only valid version of the GPL as far as this project -+ Note that the only valid version of the G.P.L as far as this project -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like -@@ -12 +12 @@ -- This file is licensed under the GPL v2, or a later version -+ This file is licensed under the G.P.L v2, or a later version -EOF - -test_expect_success \ - 'validate output from diff-helper (#1)' \ - 'compare_diff_patch current expected' - ################################################################ test_expect_success \ @@ -101,36 +69,6 @@ test_expect_success \ 'validate output from rename/copy detection (#2)' \ 'compare_diff_raw_z current expected' -# make sure diff-helper can grok it. -mv current diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING ---- a/COPYING -+++ b/COPYING -@@ -2 +2 @@ -- Note that the only valid version of the GPL as far as this project -+ Note that the only valid version of the G.P.L as far as this project -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like -@@ -12 +12 @@ -- This file is licensed under the GPL v2, or a later version -+ This file is licensed under the G.P.L v2, or a later version -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -EOF - -test_expect_success \ - 'validate output from diff-helper (#2)' \ - 'compare_diff_patch current expected' - ################################################################ # tree has COPYING and rezrov. work tree has the same COPYING and @@ -154,22 +92,4 @@ test_expect_success \ 'validate output from rename/copy detection (#3)' \ 'compare_diff_raw_z current expected' -# make sure diff-helper can grok it. -mv current diff-raw -GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current -cat >expected <<\EOF -diff --git a/COPYING b/COPYING.1 -copy from COPYING -copy to COPYING.1 ---- a/COPYING -+++ b/COPYING.1 -@@ -6 +6 @@ -- HOWEVER, in order to allow a migration to GPLv3 if that seems like -+ However, in order to allow a migration to GPLv3 if that seems like -EOF - -test_expect_success \ - 'validate output from diff-helper (#3)' \ - 'compare_diff_patch current expected' - test_done |