diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:06 -0700 |
| commit | e9a6d713316d2e774d8005b8594a4fad75d7652d (patch) | |
| tree | b785c5e2a1c08f7ed88560a80f4450d426539b23 /t/perf/p4211-line-log.sh | |
| parent | Merge branch 'jk/ansi-color' (diff) | |
| parent | p4211: explicitly disable renames in no-rename test (diff) | |
| download | tgif-e9a6d713316d2e774d8005b8594a4fad75d7652d.tar.xz | |
Merge branch 'jk/perf-any-version'
Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.
* jk/perf-any-version:
p4211: explicitly disable renames in no-rename test
t/perf: fix regression in testing older versions of git
Diffstat (limited to 't/perf/p4211-line-log.sh')
| -rwxr-xr-x | t/perf/p4211-line-log.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/perf/p4211-line-log.sh b/t/perf/p4211-line-log.sh index 3d074b0e41..b7ff68d4fa 100755 --- a/t/perf/p4211-line-log.sh +++ b/t/perf/p4211-line-log.sh @@ -23,11 +23,11 @@ test_perf 'git log --follow (baseline for -M)' ' git log --oneline --follow -- "$file" >/dev/null ' -test_perf 'git log -L' ' - git log -L 1:"$file" >/dev/null +test_perf 'git log -L (renames off)' ' + git log --no-renames -L 1:"$file" >/dev/null ' -test_perf 'git log -M -L' ' +test_perf 'git log -L (renames on)' ' git log -M -L 1:"$file" >/dev/null ' |