Merge branch 'next'

Author: scottchiefbaker

diff-so-fancy

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-my $VERSION = "1.1.0";
+my $VERSION = "1.1.1";
 
 #################################################################################
 
@@ -367,13 +367,17 @@ sub get_git_config_hash {
 	my %hash;
 	foreach my $line (@$out) {
 		my ($key,$value) = split("=",$line,2);
-		$value =~ s/\s+$//;
-		my @path = split(/\./,$key);
 
-		my $last = pop @path;
-		my $p = \%hash;
-		$p = $p->{$_} ||= {} for @path;
-		$p->{$last} = $value;
+		if ($key && $value) {
+			$value   =~ s/\s+$//;
+			my @path = split(/\./,$key);
+			my $last = pop @path;
+			my $p    = \%hash;
+
+			# Build the tree for each section
+			$p = $p->{$_} ||= {} for @path;
+			$p->{$last} = $value;
+		}
 	}
 
 	return \%hash;
@@ -612,13 +616,12 @@ sub is_windows {
 
 # Return value is whether this is the first time they've run d-s-f
 sub check_first_run {
-	my $i   = get_git_config_hash();
 	my $ret = 0;
 
 	# If first-run is not set, or it's set to "true"
-	my $first_run     = boolean(!$i->{'diff-so-fancy'}->{'first-run'} || ($i->{'diff-so-fancy'}->{'first-run'} eq "true"));
+	my $first_run     = git_config_boolean('diff-so-fancy.first-run');
 	# See if they're previously set SOME diff-highlight colors
-	my $has_dh_colors = boolean($i->{color}->{'diff-highlight'}->{oldnormal} || $i->{color}->{'diff-highlight'}->{newnormal});
+	my $has_dh_colors = git_config_boolean('color.diff-highlight.oldnormal') || git_config_boolean('color.diff-highlight.newnormal');
 
 	if (!$first_run || $has_dh_colors) {
 		return 0;

test/test_helper/util.bash

@@ -13,9 +13,9 @@ set_env() {
 
 # applying colors so ANSI color values will match
 # FIXME: not everyone will have these set, so we need to test for that.
-git config color.diff.meta "yellow bold"
-git config color.diff.commit "green bold"
+git config color.diff.meta "227"
 git config color.diff.frag "magenta bold"
+git config color.diff.commit "227 bold"
 git config color.diff.old "red bold"
 git config color.diff.new "green bold"
 git config color.diff.whitespace "red reverse"