Here's a re-roll based on the review from Yuchen. The two changes are:
1. Added a missing &&-chain in patch 3 (which cascades into patch 6).
2. Avoid length(undef), since old perl versions will warn about it.
Patch list and range diff below.
1: c59dd0aac9 = 1: c59dd0aac9 contrib/diff-highlight: do not highlight identical pairs
2: 16aa04fc6d = 2: 16aa04fc6d diff-highlight: mention build instructions
3: 55788fac3a = 3: 55788fac3a diff-highlight: drop perl version dependency back to 5.8
4: 7c2af2348b ! 4: 1101c94f65 diff-highlight: check diff-highlight exit status in tests
@@ contrib/diff-highlight/t/t9400-diff-highlight.sh: dh_test () {
- "$DIFF_HIGHLIGHT" <diff.raw | test_strip_patch_header >diff.act &&
- "$DIFF_HIGHLIGHT" <commit.raw | test_strip_patch_header >commit.act &&
+ "$DIFF_HIGHLIGHT" <diff.raw >diff.hi &&
-+ test_strip_patch_header <diff.hi >diff.act
++ test_strip_patch_header <diff.hi >diff.act &&
+ "$DIFF_HIGHLIGHT" <commit.raw >commit.hi &&
+ test_strip_patch_header <commit.hi >commit.act &&
test_cmp patch.exp diff.act &&
5: 52f0358329 = 5: 65420b8b79 t: add matching negative attributes to test_decode_color
6: 0f1aacf264 ! 6: 60977c32f6 diff-highlight: use test_decode_color in tests
@@ contrib/diff-highlight/t/t9400-diff-highlight.sh: dh_test () {
} >/dev/null &&
"$DIFF_HIGHLIGHT" <diff.raw >diff.hi &&
-- test_strip_patch_header <diff.hi >diff.act
-+ test_strip_patch_header <diff.hi | test_decode_color >diff.act
+- test_strip_patch_header <diff.hi >diff.act &&
++ test_strip_patch_header <diff.hi | test_decode_color >diff.act &&
"$DIFF_HIGHLIGHT" <commit.raw >commit.hi &&
- test_strip_patch_header <commit.hi >commit.act &&
+ test_strip_patch_header <commit.hi | test_decode_color >commit.act &&
7: 8bad893f09 = 7: bf33329640 diff-highlight: test color config
8: 179f83d791 = 8: ea71a8b648 diff-highlight: allow module callers to pass in color config
9: b8ff37b193 ! 9: aab7912ca2 diff-highlight: fetch all config with one process
@@ contrib/diff-highlight/DiffHighlight.pm: sub highlight_stdin {
+ our $cached_config;
my ($key, $default) = @_;
- my $s = `git config --get-color $key 2>$NULL`;
+- return length($s) ? $s : $default;
+
+ if (!defined $cached_config) {
+ $cached_config = {};
@@ contrib/diff-highlight/DiffHighlight.pm: sub highlight_stdin {
+ }
+
+ my $s = $cached_config->{$key};
- return length($s) ? $s : $default;
++ return defined($s) ? $s : $default;
}
+ sub show_hunk {
@@ contrib/diff-highlight/DiffHighlight.pm: sub load_color_config {
# always be set if you want highlighting to do anything.
if (!defined $OLD_HIGHLIGHT[1]) { [1/8]: diff-highlight: mention build instructions
[2/8]: diff-highlight: drop perl version dependency back to 5.8
[3/8]: diff-highlight: check diff-highlight exit status in tests
[4/8]: t: add matching negative attributes to test_decode_color
[5/8]: diff-highlight: use test_decode_color in tests
[6/8]: diff-highlight: test color config
[7/8]: diff-highlight: allow module callers to pass in color config
[8/8]: diff-highlight: fetch all config with one process
contrib/diff-highlight/DiffHighlight.pm | 59 +++++++++++-----
contrib/diff-highlight/README | 19 +++++-
.../diff-highlight/t/t9400-diff-highlight.sh | 67 +++++++++++++------
t/test-lib-functions.sh | 3 +
4 files changed, 112 insertions(+), 36 deletions(-)