Merge pull request #414 from gramosg/master

Fix fg/bg extraction with l.t. 2 colors

Author: scottchiefbaker

diff-so-fancy

@@ -918,14 +918,15 @@ sub git_ansi_color {
 
 	if (grep { /bold/ } @parts) {
 		push(@ansi_part, "1");
-		@parts = grep { !/bold/ } @parts; # Remove from array
 	}
 
 	if (grep { /reverse/ } @parts) {
 		push(@ansi_part, "7");
-		@parts = grep { !/reverse/ } @parts; # Remove from array
 	}
 
+	# Remove parts that aren't colors
+	@parts = grep { exists $colors->{$_} || is_numeric($_) } @parts;
+
 	my $fg  = $parts[0] // "";
 	my $bg  = $parts[1] // "";
 

test/git_ansi_color.pl

@@ -121,14 +121,15 @@ sub git_ansi_color {
 
 	if (grep { /bold/ } @parts) {
 		push(@ansi_part, "1");
-		@parts = grep { !/bold/ } @parts; # Remove from array
 	}
 
 	if (grep { /reverse/ } @parts) {
 		push(@ansi_part, "7");
-		@parts = grep { !/reverse/ } @parts; # Remove from array
 	}
 
+	# Remove parts that aren't colors
+	@parts = grep { exists $colors->{$_} || is_numeric($_) } @parts;
+
 	my $fg  = $parts[0] // "";
 	my $bg  = $parts[1] // "";