diff.*Prefix: use camelCase in the doc and test titles
We added documentation for diff.srcPrefix and diff.dstPrefix with their names properly camelCased, but the diff.noPrefix is listed there in all lowercase. Also these configuration variables, both existing ones and the {src,dst}Prefix we recently added, were spelled in all lowercase in the tests in t4013. Now we are done with the main change, clean these up. Signed-off-by: Junio C Hamano <gitster@pobox.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 15, 2024 at 22:57 UTC
178401dc25cf8c3f1a716b852b14dafa79367646
2 files changed
+25
-25
Documentation/config/diff.txt
+1
-1
@@ -108,7 +108,7 @@ diff.mnemonicPrefix::
108
`git diff --no-index a b`;;
109
compares two non-git things (1) and (2).
110
111
-diff.noprefix::
111
+diff.noPrefix::
112
If set, 'git diff' does not show any source or destination prefix.
113
114
diff.srcPrefix::
t/t4013-diff-various.sh
+24
-24
@@ -633,8 +633,8 @@ check_prefix () {
633
test_cmp expect actual.paths
634
}
635
636
-test_expect_success 'diff-files does not respect diff.noprefix' '
637
- git -c diff.noprefix diff-files -p >actual &&
636
+test_expect_success 'diff-files does not respect diff.noPrefix' '
637
+ git -c diff.noPrefix diff-files -p >actual &&
638
check_prefix actual a/file0 b/file0
639
'
640
@@ -643,58 +643,58 @@ test_expect_success 'diff-files respects --no-prefix' '
643
check_prefix actual file0 file0
644
'
645
646
-test_expect_success 'diff respects diff.noprefix' '
647
- git -c diff.noprefix diff >actual &&
646
+test_expect_success 'diff respects diff.noPrefix' '
647
+ git -c diff.noPrefix diff >actual &&
648
check_prefix actual file0 file0
649
'
650
651
-test_expect_success 'diff --default-prefix overrides diff.noprefix' '
652
- git -c diff.noprefix diff --default-prefix >actual &&
651
+test_expect_success 'diff --default-prefix overrides diff.noPrefix' '
652
+ git -c diff.noPrefix diff --default-prefix >actual &&
653
check_prefix actual a/file0 b/file0
654
'
655
656
-test_expect_success 'diff respects diff.mnemonicprefix' '
657
- git -c diff.mnemonicprefix diff >actual &&
656
+test_expect_success 'diff respects diff.mnemonicPrefix' '
657
+ git -c diff.mnemonicPrefix diff >actual &&
658
check_prefix actual i/file0 w/file0
659
'
660
661
-test_expect_success 'diff --default-prefix overrides diff.mnemonicprefix' '
662
- git -c diff.mnemonicprefix diff --default-prefix >actual &&
661
+test_expect_success 'diff --default-prefix overrides diff.mnemonicPrefix' '
662
+ git -c diff.mnemonicPrefix diff --default-prefix >actual &&
663
check_prefix actual a/file0 b/file0
664
'
665
666
-test_expect_success 'diff respects diff.srcprefix' '
667
- git -c diff.srcprefix=x/ diff >actual &&
666
+test_expect_success 'diff respects diff.srcPrefix' '
667
+ git -c diff.srcPrefix=x/ diff >actual &&
668
check_prefix actual x/file0 b/file0
669
'
670
671
-test_expect_success 'diff respects diff.dstprefix' '
672
- git -c diff.dstprefix=y/ diff >actual &&
671
+test_expect_success 'diff respects diff.dstPrefix' '
672
+ git -c diff.dstPrefix=y/ diff >actual &&
673
check_prefix actual a/file0 y/file0
674
'
675
676
-test_expect_success 'diff --src-prefix overrides diff.srcprefix' '
677
- git -c diff.srcprefix=y/ diff --src-prefix=z/ >actual &&
676
+test_expect_success 'diff --src-prefix overrides diff.srcPrefix' '
677
+ git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
678
check_prefix actual z/file0 b/file0
679
'
680
681
-test_expect_success 'diff --dst-prefix overrides diff.dstprefix' '
682
- git -c diff.dstprefix=y/ diff --dst-prefix=z/ >actual &&
681
+test_expect_success 'diff --dst-prefix overrides diff.dstPrefix' '
682
+ git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
683
check_prefix actual a/file0 z/file0
684
'
685
686
-test_expect_success 'diff.{src,dst}prefix ignored with diff.noprefix' '
687
- git -c diff.dstprefix=y/ -c diff.srcprefix=x/ -c diff.noprefix diff >actual &&
686
+test_expect_success 'diff.{src,dst}Prefix ignored with diff.noPrefix' '
687
+ git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
688
check_prefix actual file0 file0
689
'
690
691
-test_expect_success 'diff.{src,dst}prefix ignored with diff.mnemonicprefix' '
692
- git -c diff.dstprefix=x/ -c diff.srcprefix=y/ -c diff.mnemonicprefix diff >actual &&
691
+test_expect_success 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix' '
692
+ git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
693
check_prefix actual i/file0 w/file0
694
'
695
696
-test_expect_success 'diff.{src,dst}prefix ignored with --default-prefix' '
697
- git -c diff.dstprefix=x/ -c diff.srcprefix=y/ diff --default-prefix >actual &&
696
+test_expect_success 'diff.{src,dst}Prefix ignored with --default-prefix' '
697
+ git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
698
check_prefix actual a/file0 b/file0
699
'
700