From: Stephan Beyer <s-beyer@gmx.net>
Date: Sun, 8 Feb 2009 17:40:39 +0000 (+0100)
Subject: add -p: get rid of Git.pm warnings about unitialized values
X-Git-Tag: v1.6.2-rc1~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9aad6cbaef3c459ff4953f5a22bbbc7abfc72800;p=git.git

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>
---

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index ec47888f5..5f129a420 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);
 }