mirror of
https://github.com/git/git
synced 2024-11-05 04:53:18 +00:00
6b15d9ca7f
When parsing invalid ignore regexes passed via the `-I` option we don't free already-allocated memory, leading to a memory leak. Fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
708 lines
20 KiB
Bash
Executable file
708 lines
20 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='Various diff formatting options'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-diff.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
mkdir dir &&
|
|
mkdir dir2 &&
|
|
test_write_lines 1 2 3 >file0 &&
|
|
test_write_lines A B >dir/sub &&
|
|
cat file0 >file2 &&
|
|
git add file0 file2 dir/sub &&
|
|
git commit -m Initial &&
|
|
|
|
git branch initial &&
|
|
git branch side &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
test_write_lines 4 5 6 >>file0 &&
|
|
test_write_lines C D >>dir/sub &&
|
|
rm -f file2 &&
|
|
git update-index --remove file0 file2 dir/sub &&
|
|
git commit -m "Second${LF}${LF}This is the second commit." &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
test_write_lines A B C >file1 &&
|
|
git add file1 &&
|
|
test_write_lines E F >>dir/sub &&
|
|
git update-index dir/sub &&
|
|
git commit -m Third &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
git checkout side &&
|
|
test_write_lines A B C >>file0 &&
|
|
test_write_lines 1 2 >>dir/sub &&
|
|
cat dir/sub >file3 &&
|
|
git add file3 &&
|
|
git update-index file0 dir/sub &&
|
|
git commit -m Side &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
git checkout master &&
|
|
git pull -s ours --no-rebase . side &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
|
|
test_write_lines A B C >>file0 &&
|
|
test_write_lines 1 2 >>dir/sub &&
|
|
git update-index file0 dir/sub &&
|
|
|
|
mkdir dir3 &&
|
|
cp dir/sub dir3/sub &&
|
|
test-tool chmtime +1 dir3/sub &&
|
|
|
|
git config log.showroot false &&
|
|
git commit --amend &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
git checkout -b rearrange initial &&
|
|
test_write_lines B A >dir/sub &&
|
|
git add dir/sub &&
|
|
git commit -m "Rearranged lines in dir/sub" &&
|
|
git checkout master &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
git checkout -b mode initial &&
|
|
git update-index --chmod=+x file0 &&
|
|
git commit -m "update mode" &&
|
|
git checkout -f master &&
|
|
|
|
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
|
|
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
|
|
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
|
git checkout -b note initial &&
|
|
git update-index --chmod=+x file2 &&
|
|
git commit -m "update mode (file2)" &&
|
|
git notes add -m "note" &&
|
|
git checkout -f master &&
|
|
|
|
# Same merge as master, but with parents reversed. Hide it in a
|
|
# pseudo-ref to avoid impacting tests with --all.
|
|
commit=$(echo reverse |
|
|
git commit-tree -p master^2 -p master^1 master^{tree}) &&
|
|
git update-ref REVERSE $commit &&
|
|
|
|
git config diff.renames false &&
|
|
|
|
git show-branch
|
|
'
|
|
|
|
: <<\EOF
|
|
! [initial] Initial
|
|
* [master] Merge branch 'side'
|
|
! [rearrange] Rearranged lines in dir/sub
|
|
! [side] Side
|
|
----
|
|
+ [rearrange] Rearranged lines in dir/sub
|
|
- [master] Merge branch 'side'
|
|
* + [side] Side
|
|
* [master^] Third
|
|
* [master~2] Second
|
|
+*++ [initial] Initial
|
|
EOF
|
|
|
|
process_diffs () {
|
|
perl -e '
|
|
my $oid_length = length($ARGV[0]);
|
|
my $x40 = "[0-9a-f]{40}";
|
|
my $xab = "[0-9a-f]{4,16}";
|
|
my $orx = "[0-9a-f]" x $oid_length;
|
|
|
|
sub munge_oid {
|
|
my ($oid) = @_;
|
|
my $x;
|
|
|
|
return "" unless length $oid;
|
|
|
|
if ($oid =~ /^(100644|100755|120000)$/) {
|
|
return $oid;
|
|
}
|
|
|
|
if ($oid =~ /^0*$/) {
|
|
$x = "0";
|
|
} else {
|
|
$x = "f";
|
|
}
|
|
|
|
if (length($oid) == 40) {
|
|
return $x x $oid_length;
|
|
} else {
|
|
return $x x length($oid);
|
|
}
|
|
}
|
|
|
|
while (<STDIN>) {
|
|
s/($orx)/munge_oid($1)/ge;
|
|
s/From ($x40)( |\))/"From " . munge_oid($1) . $2/ge;
|
|
s/commit ($x40)($| \(from )($x40?)/"commit " . munge_oid($1) . $2 . munge_oid($3)/ge;
|
|
s/\b($x40)( |\.\.|$)/munge_oid($1) . $2/ge;
|
|
s/^($x40)($| )/munge_oid($1) . $2/e;
|
|
s/($xab)(\.\.|,| |\.\.\.|$)/munge_oid($1) . $2/ge;
|
|
print;
|
|
}
|
|
' "$ZERO_OID" <"$1"
|
|
}
|
|
|
|
V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
|
|
while read magic cmd
|
|
do
|
|
case "$magic" in
|
|
'' | '#'*)
|
|
continue ;;
|
|
:noellipses)
|
|
magic=noellipses
|
|
label="$magic-$cmd"
|
|
;;
|
|
:*)
|
|
BUG "unknown magic $magic"
|
|
;;
|
|
*)
|
|
cmd="$magic $cmd"
|
|
magic=
|
|
label="$cmd"
|
|
;;
|
|
esac
|
|
|
|
test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
|
|
pfx=$(printf "%04d" $test_count)
|
|
expect="$TEST_DIRECTORY/t4013/diff.$test"
|
|
actual="$pfx-diff.$test"
|
|
|
|
test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
|
|
{
|
|
echo "$ git $cmd"
|
|
case "$magic" in
|
|
"")
|
|
GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
|
|
noellipses)
|
|
git $cmd ;;
|
|
esac |
|
|
sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
|
|
-e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
|
|
echo "\$"
|
|
} >"$actual" &&
|
|
if test -f "$expect"
|
|
then
|
|
process_diffs "$actual" >actual &&
|
|
process_diffs "$expect" >expect &&
|
|
case $cmd in
|
|
*format-patch* | *-stat*)
|
|
test_cmp expect actual;;
|
|
*)
|
|
test_cmp expect actual;;
|
|
esac &&
|
|
rm -f "$actual" actual expect
|
|
else
|
|
# this is to help developing new tests.
|
|
cp "$actual" "$expect"
|
|
false
|
|
fi
|
|
'
|
|
done <<\EOF
|
|
diff-tree initial
|
|
diff-tree -r initial
|
|
diff-tree -r --abbrev initial
|
|
diff-tree -r --abbrev=4 initial
|
|
diff-tree --root initial
|
|
diff-tree --root --abbrev initial
|
|
:noellipses diff-tree --root --abbrev initial
|
|
diff-tree --root -r initial
|
|
diff-tree --root -r --abbrev initial
|
|
:noellipses diff-tree --root -r --abbrev initial
|
|
diff-tree --root -r --abbrev=4 initial
|
|
:noellipses diff-tree --root -r --abbrev=4 initial
|
|
diff-tree -p initial
|
|
diff-tree --root -p initial
|
|
diff-tree --root -p --abbrev=10 initial
|
|
diff-tree --root -p --full-index initial
|
|
diff-tree --root -p --full-index --abbrev=10 initial
|
|
diff-tree --patch-with-stat initial
|
|
diff-tree --root --patch-with-stat initial
|
|
diff-tree --patch-with-raw initial
|
|
diff-tree --root --patch-with-raw initial
|
|
|
|
diff-tree --pretty initial
|
|
diff-tree --pretty --root initial
|
|
diff-tree --pretty -p initial
|
|
diff-tree --pretty --stat initial
|
|
diff-tree --pretty --summary initial
|
|
diff-tree --pretty --stat --summary initial
|
|
diff-tree --pretty --root -p initial
|
|
diff-tree --pretty --root --stat initial
|
|
# improved by Timo's patch
|
|
diff-tree --pretty --root --summary initial
|
|
# improved by Timo's patch
|
|
diff-tree --pretty --root --summary -r initial
|
|
diff-tree --pretty --root --stat --summary initial
|
|
diff-tree --pretty --patch-with-stat initial
|
|
diff-tree --pretty --root --patch-with-stat initial
|
|
diff-tree --pretty --patch-with-raw initial
|
|
diff-tree --pretty --root --patch-with-raw initial
|
|
|
|
diff-tree --pretty=oneline initial
|
|
diff-tree --pretty=oneline --root initial
|
|
diff-tree --pretty=oneline -p initial
|
|
diff-tree --pretty=oneline --root -p initial
|
|
diff-tree --pretty=oneline --patch-with-stat initial
|
|
# improved by Timo's patch
|
|
diff-tree --pretty=oneline --root --patch-with-stat initial
|
|
diff-tree --pretty=oneline --patch-with-raw initial
|
|
diff-tree --pretty=oneline --root --patch-with-raw initial
|
|
|
|
diff-tree --pretty side
|
|
diff-tree --pretty -p side
|
|
diff-tree --pretty --patch-with-stat side
|
|
|
|
diff-tree initial mode
|
|
diff-tree --stat initial mode
|
|
diff-tree --summary initial mode
|
|
|
|
diff-tree master
|
|
diff-tree -m master
|
|
diff-tree -p master
|
|
diff-tree -p -m master
|
|
diff-tree -c master
|
|
diff-tree -c --abbrev master
|
|
:noellipses diff-tree -c --abbrev master
|
|
diff-tree --cc master
|
|
# stat only should show the diffstat with the first parent
|
|
diff-tree -c --stat master
|
|
diff-tree --cc --stat master
|
|
diff-tree -c --stat --summary master
|
|
diff-tree --cc --stat --summary master
|
|
# stat summary should show the diffstat and summary with the first parent
|
|
diff-tree -c --stat --summary side
|
|
diff-tree --cc --stat --summary side
|
|
diff-tree --cc --shortstat master
|
|
diff-tree --cc --summary REVERSE
|
|
# improved by Timo's patch
|
|
diff-tree --cc --patch-with-stat master
|
|
# improved by Timo's patch
|
|
diff-tree --cc --patch-with-stat --summary master
|
|
# this is correct
|
|
diff-tree --cc --patch-with-stat --summary side
|
|
|
|
log master
|
|
log -p master
|
|
log --root master
|
|
log --root -p master
|
|
log --patch-with-stat master
|
|
log --root --patch-with-stat master
|
|
log --root --patch-with-stat --summary master
|
|
# improved by Timo's patch
|
|
log --root -c --patch-with-stat --summary master
|
|
# improved by Timo's patch
|
|
log --root --cc --patch-with-stat --summary master
|
|
log --no-diff-merges -p --first-parent master
|
|
log --diff-merges=off -p --first-parent master
|
|
log --first-parent --diff-merges=off -p master
|
|
log -p --first-parent master
|
|
log -p --diff-merges=first-parent master
|
|
log --diff-merges=first-parent master
|
|
log -m -p --first-parent master
|
|
log -m -p master
|
|
log --cc -m -p master
|
|
log -c -m -p master
|
|
log -m --raw master
|
|
log -m --stat master
|
|
log -SF master
|
|
log -S F master
|
|
log -SF -p master
|
|
log -SF master --max-count=0
|
|
log -SF master --max-count=1
|
|
log -SF master --max-count=2
|
|
log -GF master
|
|
log -GF -p master
|
|
log -GF -p --pickaxe-all master
|
|
log -IA -IB -I1 -I2 -p master
|
|
log --decorate --all
|
|
log --decorate=full --all
|
|
log --decorate --clear-decorations --all
|
|
log --decorate=full --clear-decorations --all
|
|
|
|
rev-list --parents HEAD
|
|
rev-list --children HEAD
|
|
|
|
whatchanged master
|
|
:noellipses whatchanged master
|
|
whatchanged -p master
|
|
whatchanged --root master
|
|
:noellipses whatchanged --root master
|
|
whatchanged --root -p master
|
|
whatchanged --patch-with-stat master
|
|
whatchanged --root --patch-with-stat master
|
|
whatchanged --root --patch-with-stat --summary master
|
|
# improved by Timo's patch
|
|
whatchanged --root -c --patch-with-stat --summary master
|
|
# improved by Timo's patch
|
|
whatchanged --root --cc --patch-with-stat --summary master
|
|
whatchanged -SF master
|
|
:noellipses whatchanged -SF master
|
|
whatchanged -SF -p master
|
|
|
|
log --patch-with-stat master -- dir/
|
|
whatchanged --patch-with-stat master -- dir/
|
|
log --patch-with-stat --summary master -- dir/
|
|
whatchanged --patch-with-stat --summary master -- dir/
|
|
|
|
show initial
|
|
show --root initial
|
|
show side
|
|
show master
|
|
show -c master
|
|
show -m master
|
|
show --first-parent master
|
|
show --stat side
|
|
show --stat --summary side
|
|
show --patch-with-stat side
|
|
show --patch-with-raw side
|
|
:noellipses show --patch-with-raw side
|
|
show --patch-with-stat --summary side
|
|
|
|
format-patch --stdout initial..side
|
|
format-patch --stdout initial..master^
|
|
format-patch --stdout initial..master
|
|
format-patch --stdout --no-numbered initial..master
|
|
format-patch --stdout --numbered initial..master
|
|
format-patch --attach --stdout initial..side
|
|
format-patch --attach --stdout --suffix=.diff initial..side
|
|
format-patch --attach --stdout initial..master^
|
|
format-patch --attach --stdout initial..master
|
|
format-patch --inline --stdout initial..side
|
|
format-patch --inline --stdout initial..master^
|
|
format-patch --inline --stdout --numbered-files initial..master
|
|
format-patch --inline --stdout initial..master
|
|
format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
|
|
config format.subjectprefix DIFFERENT_PREFIX
|
|
format-patch --inline --stdout initial..master^^
|
|
format-patch --stdout --cover-letter -n initial..master^
|
|
|
|
diff --abbrev initial..side
|
|
diff -U initial..side
|
|
diff -U1 initial..side
|
|
diff -r initial..side
|
|
diff --stat initial..side
|
|
diff -r --stat initial..side
|
|
diff initial..side
|
|
diff --patch-with-stat initial..side
|
|
diff --patch-with-raw initial..side
|
|
:noellipses diff --patch-with-raw initial..side
|
|
diff --patch-with-stat -r initial..side
|
|
diff --patch-with-raw -r initial..side
|
|
:noellipses diff --patch-with-raw -r initial..side
|
|
diff --name-status dir2 dir
|
|
diff --no-index --name-status dir2 dir
|
|
diff --no-index --name-status -- dir2 dir
|
|
diff --no-index dir dir3
|
|
diff master master^ side
|
|
# Can't use spaces...
|
|
diff --line-prefix=abc master master^ side
|
|
diff --dirstat master~1 master~2
|
|
diff --dirstat initial rearrange
|
|
diff --dirstat-by-file initial rearrange
|
|
diff --dirstat --cc master~1 master
|
|
# No-index --abbrev and --no-abbrev
|
|
diff --raw initial
|
|
:noellipses diff --raw initial
|
|
diff --raw --abbrev=4 initial
|
|
:noellipses diff --raw --abbrev=4 initial
|
|
diff --raw --no-abbrev initial
|
|
diff --no-index --raw dir2 dir
|
|
:noellipses diff --no-index --raw dir2 dir
|
|
diff --no-index --raw --abbrev=4 dir2 dir
|
|
:noellipses diff --no-index --raw --abbrev=4 dir2 dir
|
|
diff --no-index --raw --no-abbrev dir2 dir
|
|
|
|
diff-tree --pretty --root --stat --compact-summary initial
|
|
diff-tree --pretty -R --root --stat --compact-summary initial
|
|
diff-tree --pretty note
|
|
diff-tree --pretty --notes note
|
|
diff-tree --format=%N note
|
|
diff-tree --stat --compact-summary initial mode
|
|
diff-tree -R --stat --compact-summary initial mode
|
|
EOF
|
|
|
|
test_expect_success 'log -m matches pure log' '
|
|
git log master >result &&
|
|
process_diffs result >expected &&
|
|
git log -m >result &&
|
|
process_diffs result >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
|
|
git log -p --diff-merges=separate master >result &&
|
|
process_diffs result >expected &&
|
|
git log -p --diff-merges=on master >result &&
|
|
process_diffs result >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'log --dd matches --diff-merges=1 -p' '
|
|
git log --diff-merges=1 -p master >result &&
|
|
process_diffs result >expected &&
|
|
git log --dd master >result &&
|
|
process_diffs result >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'deny wrong log.diffMerges config' '
|
|
test_config log.diffMerges wrong-value &&
|
|
test_expect_code 128 git log
|
|
'
|
|
|
|
test_expect_success 'git config log.diffMerges first-parent' '
|
|
git log -p --diff-merges=first-parent master >result &&
|
|
process_diffs result >expected &&
|
|
test_config log.diffMerges first-parent &&
|
|
git log -p --diff-merges=on master >result &&
|
|
process_diffs result >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'git config log.diffMerges first-parent vs -m' '
|
|
git log -p --diff-merges=first-parent master >result &&
|
|
process_diffs result >expected &&
|
|
test_config log.diffMerges first-parent &&
|
|
git log -p -m master >result &&
|
|
process_diffs result >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
# -m in "git diff-index" means "match missing", that differs
|
|
# from its meaning in "git diff". Let's check it in diff-index.
|
|
# The line in the output for removed file should disappear when
|
|
# we provide -m in diff-index.
|
|
test_expect_success 'git diff-index -m' '
|
|
rm -f file1 &&
|
|
git diff-index HEAD >without-m &&
|
|
lines_count=$(wc -l <without-m) &&
|
|
git diff-index -m HEAD >with-m &&
|
|
git restore file1 &&
|
|
test_line_count = $((lines_count - 1)) with-m
|
|
'
|
|
|
|
test_expect_success 'log -S requires an argument' '
|
|
test_must_fail git log -S
|
|
'
|
|
|
|
test_expect_success 'diff --cached on unborn branch' '
|
|
git symbolic-ref HEAD refs/heads/unborn &&
|
|
git diff --cached >result &&
|
|
process_diffs result >actual &&
|
|
process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'diff --cached -- file on unborn branch' '
|
|
git diff --cached -- file0 >result &&
|
|
process_diffs result >actual &&
|
|
process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
test_expect_success 'diff --line-prefix with spaces' '
|
|
git diff --line-prefix="| | | " --cached -- file0 >result &&
|
|
process_diffs result >actual &&
|
|
process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'diff-tree --stdin with log formatting' '
|
|
cat >expect <<-\EOF &&
|
|
Side
|
|
Third
|
|
Second
|
|
EOF
|
|
git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff-tree --stdin with pathspec' '
|
|
cat >expect <<-EOF &&
|
|
Third
|
|
|
|
dir/sub
|
|
Second
|
|
|
|
dir/sub
|
|
EOF
|
|
git rev-list master^ |
|
|
git diff-tree -r --stdin --name-only --format=%s dir >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show A B ... -- <pathspec>' '
|
|
# side touches dir/sub, file0, and file3
|
|
# master^ touches dir/sub, and file1
|
|
# master^^ touches dir/sub, file0, and file2
|
|
git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
|
|
cat >expect <<-\EOF &&
|
|
<Side>
|
|
|
|
dir/sub
|
|
<Third>
|
|
|
|
dir/sub
|
|
<Second>
|
|
|
|
dir/sub
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff -I<regex>: setup' '
|
|
git checkout master &&
|
|
test_seq 50 >file0 &&
|
|
git commit -m "Set up -I<regex> test file" file0 &&
|
|
test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
|
|
echo >>file0
|
|
'
|
|
test_expect_success 'diff -I<regex>' '
|
|
git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
|
|
cat >expect <<-\EOF &&
|
|
diff --git a/file0 b/file0
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -34,7 +31,6 @@
|
|
34
|
|
35
|
|
36
|
|
-37
|
|
38
|
|
39
|
|
40
|
|
EOF
|
|
compare_diff_patch expect actual
|
|
'
|
|
|
|
test_expect_success 'diff -I<regex> --stat' '
|
|
git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
|
|
cat >expect <<-\EOF &&
|
|
file0 | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff -I<regex>: detect malformed regex' '
|
|
test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
|
|
test_grep "invalid regex given to -I: " error
|
|
'
|
|
|
|
# check_prefix <patch> <src> <dst>
|
|
# check only lines with paths to avoid dependency on exact oid/contents
|
|
check_prefix () {
|
|
grep -E '^(diff|---|\+\+\+) ' "$1" >actual.paths &&
|
|
cat >expect <<-EOF &&
|
|
diff --git $2 $3
|
|
--- $2
|
|
+++ $3
|
|
EOF
|
|
test_cmp expect actual.paths
|
|
}
|
|
|
|
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
|
|
'
|
|
|
|
test_expect_success 'diff-files respects --no-prefix' '
|
|
git diff-files -p --no-prefix >actual &&
|
|
check_prefix actual file0 file0
|
|
'
|
|
|
|
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 &&
|
|
check_prefix actual a/file0 b/file0
|
|
'
|
|
|
|
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 &&
|
|
check_prefix actual a/file0 b/file0
|
|
'
|
|
|
|
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 &&
|
|
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 &&
|
|
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 &&
|
|
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 &&
|
|
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 &&
|
|
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 &&
|
|
check_prefix actual a/file0 b/file0
|
|
'
|
|
|
|
test_expect_success 'diff --no-renames cannot be abbreviated' '
|
|
test_expect_code 129 git diff --no-rename >actual 2>error &&
|
|
test_must_be_empty actual &&
|
|
grep "invalid option: --no-rename" error
|
|
'
|
|
|
|
test_done
|