aboutsummaryrefslogtreecommitdiff
path: root/git-remote.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-26 23:17:23 -0700
committerJunio C Hamano <gitster@pobox.com>2007-10-26 23:17:23 -0700
commitd633f702a007ecdd19cfd884c6da90f51156ca63 (patch)
treee096ababf6bf12ccd2f21062846e2d3c9405d9f8 /git-remote.perl
parent15387e32ff5116b82d3fe53df55b8c87eec83e01 (diff)
parentd1a2057560b33c926ba481618105edbb65d2c91c (diff)
downloadgit-d633f702a007ecdd19cfd884c6da90f51156ca63.tar.gz
git-d633f702a007ecdd19cfd884c6da90f51156ca63.tar.xz
Merge branch 'maint'
* maint: Fix generation of perl/perl.mak git-remote: fix "Use of uninitialized value in string ne"
Diffstat (limited to 'git-remote.perl')
-rwxr-xr-xgit-remote.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-remote.perl b/git-remote.perl
index 9ca3e7ef3..d13e4c1fe 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -244,7 +244,8 @@ sub show_remote {
print "* remote $name\n";
print " URL: $info->{'URL'}\n";
for my $branchname (sort keys %$branch) {
- next if ($branch->{$branchname}{'REMOTE'} ne $name);
+ next unless (defined $branch->{$branchname}{'REMOTE'} &&
+ $branch->{$branchname}{'REMOTE'} eq $name);
my @merged = map {
s|^refs/heads/||;
$_;