mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 08:46:09 +02:00
Code

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>
This commit is contained in:
Junio C Hamano 2024-03-15 22:57:22 -07:00
parent 7fdc265633
commit 178401dc25
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/diff.txt
View File

@ -108,7 +108,7 @@ diff.mnemonicPrefix::
`git diff --no-index a b`;;
compares two non-git things (1) and (2).
diff.noprefix::
diff.noPrefix::
If set, 'git diff' does not show any source or destination prefix.
diff.srcPrefix::

48
t/t4013-diff-various.sh
View File

@ -633,8 +633,8 @@ check_prefix () {
test_cmp expect actual.paths
}
test_expect_success 'diff-files does not respect diff.noprefix' '
git -c diff.noprefix diff-files -p >actual &&
test_expect_success 'diff-files does not respect diff.noPrefix' '
git -c diff.noPrefix diff-files -p >actual &&
check_prefix actual a/file0 b/file0
'
@ -643,58 +643,58 @@ test_expect_success 'diff-files respects --no-prefix' '
check_prefix actual file0 file0
'
test_expect_success 'diff respects diff.noprefix' '
git -c diff.noprefix diff >actual &&
test_expect_success 'diff respects diff.noPrefix' '
git -c diff.noPrefix diff >actual &&
check_prefix actual file0 file0
'
test_expect_success 'diff --default-prefix overrides diff.noprefix' '
git -c diff.noprefix diff --default-prefix >actual &&
test_expect_success 'diff --default-prefix overrides diff.noPrefix' '
git -c diff.noPrefix diff --default-prefix >actual &&
check_prefix actual a/file0 b/file0
'
test_expect_success 'diff respects diff.mnemonicprefix' '
git -c diff.mnemonicprefix diff >actual &&
test_expect_success 'diff respects diff.mnemonicPrefix' '
git -c diff.mnemonicPrefix diff >actual &&
check_prefix actual i/file0 w/file0
'
test_expect_success 'diff --default-prefix overrides diff.mnemonicprefix' '
git -c diff.mnemonicprefix diff --default-prefix >actual &&
test_expect_success 'diff --default-prefix overrides diff.mnemonicPrefix' '
git -c diff.mnemonicPrefix diff --default-prefix >actual &&
check_prefix actual a/file0 b/file0
'
test_expect_success 'diff respects diff.srcprefix' '
git -c diff.srcprefix=x/ diff >actual &&
test_expect_success 'diff respects diff.srcPrefix' '
git -c diff.srcPrefix=x/ diff >actual &&
check_prefix actual x/file0 b/file0
'
test_expect_success 'diff respects diff.dstprefix' '
git -c diff.dstprefix=y/ diff >actual &&
test_expect_success 'diff respects diff.dstPrefix' '
git -c diff.dstPrefix=y/ diff >actual &&
check_prefix actual a/file0 y/file0
'
test_expect_success 'diff --src-prefix overrides diff.srcprefix' '
git -c diff.srcprefix=y/ diff --src-prefix=z/ >actual &&
test_expect_success 'diff --src-prefix overrides diff.srcPrefix' '
git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
check_prefix actual z/file0 b/file0
'
test_expect_success 'diff --dst-prefix overrides diff.dstprefix' '
git -c diff.dstprefix=y/ diff --dst-prefix=z/ >actual &&
test_expect_success 'diff --dst-prefix overrides diff.dstPrefix' '
git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
check_prefix actual a/file0 z/file0
'
test_expect_success 'diff.{src,dst}prefix ignored with diff.noprefix' '
git -c diff.dstprefix=y/ -c diff.srcprefix=x/ -c diff.noprefix diff >actual &&
test_expect_success 'diff.{src,dst}Prefix ignored with diff.noPrefix' '
git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
check_prefix actual file0 file0
'
test_expect_success 'diff.{src,dst}prefix ignored with diff.mnemonicprefix' '
git -c diff.dstprefix=x/ -c diff.srcprefix=y/ -c diff.mnemonicprefix diff >actual &&
test_expect_success 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix' '
git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
check_prefix actual i/file0 w/file0
'
test_expect_success 'diff.{src,dst}prefix ignored with --default-prefix' '
git -c diff.dstprefix=x/ -c diff.srcprefix=y/ diff --default-prefix >actual &&
test_expect_success 'diff.{src,dst}Prefix ignored with --default-prefix' '
git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
check_prefix actual a/file0 b/file0
'