git-svn: get color config from --get-colorbool
git-config recently learned a --get-colorbool option. By using it, we will get the same color=auto behavior that other git commands have. Specifically, this fixes the case where "color.diff = true" meant "always" in git-svn, but "auto" in other programs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 11, 2007 at 01:28 UTC
cd459e3ffa1b85f3a33c52967b1a7dff43bda29e
1 file changed
+2
-33
git-svn.perl
+2
-33
@@ -3969,39 +3969,7 @@ sub cmt_showable {
3969
}
3970
3971
sub log_use_color {
3972
- return 1 if $color;
3973
- my ($dc, $dcvar);
3974
- $dcvar = 'color.diff';
3975
- $dc = `git-config --get $dcvar`;
3976
- if ($dc eq '') {
3977
- # nothing at all; fallback to "diff.color"
3978
- $dcvar = 'diff.color';
3979
- $dc = `git-config --get $dcvar`;
3980
- }
3981
- chomp($dc);
3982
- if ($dc eq 'auto') {
3983
- my $pc;
3984
- $pc = `git-config --get color.pager`;
3985
- if ($pc eq '') {
3986
- # does not have it -- fallback to pager.color
3987
- $pc = `git-config --bool --get pager.color`;
3988
- }
3989
- else {
3990
- $pc = `git-config --bool --get color.pager`;
3991
- if ($?) {
3992
- $pc = 'false';
3993
- }
3994
- }
3995
- chomp($pc);
3996
- if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
3997
- return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
3998
- }
3999
- return 0;
4000
- }
4001
- return 0 if $dc eq 'never';
4002
- return 1 if $dc eq 'always';
4003
- chomp($dc = `git-config --bool --get $dcvar`);
4004
- return ($dc eq 'true');
3972
+ return $color || Git->repository->get_colorbool('color.diff');
3973
}
3974
3975
sub git_svn_log_cmd {
@@ -4060,6 +4028,7 @@ sub config_pager {
4028
} elsif (length $pager == 0 || $pager eq 'cat') {
4029
$pager = undef;
4030
}
4031
+ $ENV{GIT_PAGER_IN_USE} = defined($pager);
4032
}
4033
4034
sub run_pager {