Merge branch 'en/merge-recursive-directory-rename-fixes'

[thirdparty/git.git] / t / t3206-range-diff.sh

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 0120f769f157d580717739cbd0932e7b1d27c22a..0579cd996976a60db41a7d90d1cd833773f445a3 100755 (executable)
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -333,6 +333,46 @@ test_expect_success 'renamed file' '
        test_cmp expected actual
 '
 
+test_expect_success 'file with mode only change' '
+       git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
+       sed s/Z/\ /g >expected <<-EOF &&
+       1:  fccce22 ! 1:  4d39cb3 s/4/A/
+           @@ Metadata
+           ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+           Z
+           Z ## Commit message ##
+           -    s/4/A/
+           +    s/4/A/ + add other-file
+           Z
+           Z ## file ##
+           Z@@
+           @@ file
+           Z A
+           Z 6
+           Z 7
+           +
+           + ## other-file (new) ##
+       2:  147e64e ! 2:  26c107f s/11/B/
+           @@ Metadata
+           ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+           Z
+           Z ## Commit message ##
+           -    s/11/B/
+           +    s/11/B/ + mode change other-file
+           Z
+           Z ## file ##
+           Z@@ file: A
+           @@ file: A
+           Z 12
+           Z 13
+           Z 14
+           +
+           + ## other-file (mode change 100644 => 100755) ##
+       3:  a63e992 = 3:  4c1e0f5 s/12/B/
+       EOF
+       test_cmp expected actual
+'
+
 test_expect_success 'file added and later removed' '
        git range-diff --no-color --submodule=log topic...added-removed >actual &&
        sed s/Z/\ /g >expected <<-EOF &&
@@ -461,4 +501,8 @@ test_expect_success 'format-patch --range-diff as commentary' '
        grep "> 1: .* new message" 0001-*
 '
 
+test_expect_success 'range-diff overrides diff.noprefix internally' '
+       git -c diff.noprefix=true range-diff HEAD^...
+'
+
 test_done