diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-26 23:17:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-26 23:17:23 -0700 |
| commit | d633f702a007ecdd19cfd884c6da90f51156ca63 (patch) | |
| tree | e096ababf6bf12ccd2f21062846e2d3c9405d9f8 | |
| parent | 15387e32ff5116b82d3fe53df55b8c87eec83e01 (diff) | |
| parent | d1a2057560b33c926ba481618105edbb65d2c91c (diff) | |
| download | git-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"
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | git-remote.perl | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -812,7 +812,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak -perl/perl.mak: GIT-CFLAGS +perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl @@ -931,10 +931,6 @@ $(XDIFF_LIB): $(XDIFF_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS) -perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS - (cd perl && $(PERL_PATH) Makefile.PL \ - PREFIX='$(prefix_SQ)') - doc: $(MAKE) -C Documentation all 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/||; $_; |