[PATCH] Make sure diff-helper can tell rename/copy in the new diff-raw format.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:41:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
This adds tests to make sure that diff-helper can tell renames from copies using the same "everything but the last one are copies and the last one is either rename or stay" logic. Signed-off-by: Junio C Hamano <redacted> --- t/t4003-diff-rename-1.sh | 6 +-- t/t4005-diff-rename-2.sh | 93 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 6 deletions(-)
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh@@ -58,7 +58,7 @@ rename new COPYING.# EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#1)' \ 'diff -u current expected' test_expect_success \
@@ -98,7 +98,7 @@ diff --git a/COPYING b/COPYING EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#2)' \ 'diff -u current expected' test_expect_success \
@@ -127,7 +127,7 @@ copy to COPYING.# EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#3)' \ 'diff -u current expected' test_done
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh@@ -36,7 +36,42 @@ cat >expected <<\EOF EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#1)' \ + 'diff -u current expected' + +# make sure diff-helper groks it correctly. +mv expected raw-output +GIT_DIFF_OPTS=--unified=0 git-diff-helper <raw-output | +sed -e 's/\([0-9][0-9]*\)/#/g' >current && +cat >expected <<\EOF +diff --git a/COPYING b/COPYING.# +similarity index #% +copy from COPYING +copy to COPYING.# +--- a/COPYING ++++ b/COPYING.# +@@ -# +# @@ +- HOWEVER, in order to allow a migration to GPLv# if that seems like ++ However, in order to allow a migration to GPLv# if that seems like +diff --git a/COPYING b/COPYING.# +similarity index #% +rename old COPYING +rename new COPYING.# +--- a/COPYING ++++ b/COPYING.# +@@ -# +# @@ +- 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 +@@ -# +# @@ +- HOWEVER, in order to allow a migration to GPLv# if that seems like ++ HOWEVER, in order to allow a migration to G.P.Lv# if that seems like +@@ -# +# @@ +- This file is licensed under the GPL v#, or a later version ++ This file is licensed under the G.P.L v#, or a later version +EOF + +test_expect_success \ + 'validate output from diff-helper (#1)' \ 'diff -u current expected' test_expect_success \
@@ -56,7 +91,39 @@ cat >expected <<\EOF EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#2)' \ + 'diff -u current expected' + +# make sure diff-helper groks it correctly. +mv expected raw-output +GIT_DIFF_OPTS=--unified=0 git-diff-helper <raw-output | +sed -e 's/\([0-9][0-9]*\)/#/g' >current +cat >expected <<\EOF +diff --git a/COPYING b/COPYING.# +similarity index #% +copy from COPYING +copy to COPYING.# +--- a/COPYING ++++ b/COPYING.# +@@ -# +# @@ +- HOWEVER, in order to allow a migration to GPLv# if that seems like ++ However, in order to allow a migration to GPLv# if that seems like +diff --git a/COPYING b/COPYING +--- a/COPYING ++++ b/COPYING +@@ -# +# @@ +- 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 +@@ -# +# @@ +- HOWEVER, in order to allow a migration to GPLv# if that seems like ++ HOWEVER, in order to allow a migration to G.P.Lv# if that seems like +@@ -# +# @@ +- This file is licensed under the GPL v#, or a later version ++ This file is licensed under the G.P.L v#, or a later version +EOF + +test_expect_success \ + 'validate output from diff-helper (#2)' \ 'diff -u current expected' test_expect_success \
@@ -76,7 +143,27 @@ cat >expected <<\EOF EOF test_expect_success \ - 'validate output from rename/copy detection' \ + 'validate output from rename/copy detection (#3)' \ + 'diff -u current expected' + +# make sure diff-helper groks it correctly. +mv expected raw-output +GIT_DIFF_OPTS=--unified=0 git-diff-helper <raw-output | +sed -e 's/\([0-9][0-9]*\)/#/g' >current +cat >expected <<\EOF +diff --git a/COPYING b/COPYING.# +similarity index #% +copy from COPYING +copy to COPYING.# +--- a/COPYING ++++ b/COPYING.# +@@ -# +# @@ +- HOWEVER, in order to allow a migration to GPLv# if that seems like ++ However, in order to allow a migration to GPLv# if that seems like +EOF + +test_expect_success \ + 'validate output from diff-helper (#3)' \ 'diff -u current expected' test_done ------------------------------------------------