diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2009-02-08 18:40:39 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-08 13:06:33 -0800 |
| commit | 9aad6cbaef3c459ff4953f5a22bbbc7abfc72800 (patch) | |
| tree | 94728112a631ac5150e6f83d8b2e02c5cc4c69d5 | |
| parent | GIT 1.6.2-rc0 (diff) | |
| download | tgif-9aad6cbaef3c459ff4953f5a22bbbc7abfc72800.tar.xz | |
add -p: get rid of Git.pm warnings about unitialized values
After invoking git add -p I always got the warnings:
Use of uninitialized value $_[3] in exec at Git.pm line 1282.
Use of uninitialized value $args[2] in join or string at Git.pm line 1264.
A bisect showed that these warnings occur in a301973 "add -p: print errors
in separate color" the first time.
They can be reproduced by setting color.ui (or color.interactive) to "auto"
and unsetting color.interactive.help and color.interactive.error.
I am using Perl 5.10.0.
The reason of the warning is that color.interactive.error defaults to
color.interactive.help which defaults to nothing in the specific codepath.
It defaults to 'red bold' some lines above which could lead to the wrong
assumption that it always defaults to 'red bold' now.
This patch lets it default to 'red bold', blowing the warnings away.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Acked-By: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-add--interactive.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index ec47888f57..5f129a4203 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -14,7 +14,8 @@ my ($prompt_color, $header_color, $help_color) = ) : (); my $error_color = (); if ($menu_use_color) { - my $help_color_spec = $repo->config('color.interactive.help'); + my $help_color_spec = ($repo->config('color.interactive.help') or + 'red bold'); $error_color = $repo->get_color('color.interactive.error', $help_color_spec); } |