From: Rudolf Polzer Date: Fri, 29 Apr 2011 22:23:19 +0000 (+0200) Subject: remove some warning mess X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71e492b542272243b04a3c2bfd432a3bef77a241;p=xonotic%2Fdiv0-gittools.git remove some warning mess --- diff --git a/git-branch-manager b/git-branch-manager index 78a6d06..a43225d 100755 --- a/git-branch-manager +++ b/git-branch-manager @@ -416,27 +416,33 @@ sub parse_log() my $data = $logmsg{$_}; if($data =~ /::stable-branch::unmerge=(\S+)/) { + next if not defined $history{$1}; push @logdata, ['unmerge', $1]; } elsif($data =~ /::stable-branch::merge=(\S+)/) { + next if not defined $history{$1}; push @logdata, ['merge', $1]; } elsif($data =~ /::stable-branch::reject=(\S+)/) { + next if not defined $history{$1}; push @logdata, ['reject', $1]; } elsif($data =~ /::stable-branch::unreject=(\S+)/) { + next if not defined $history{$1}; push @logdata, ['unreject', $1]; } elsif($data =~ /::stable-branch::reset=(\S+)/) { + next if not defined $history{$1}; @logdata = (); $base = $1; } elsif($data =~ /::stable-branch::rebase=(\S+)/) { + next if not defined $history{$1}; $lastrebase->[0] = 'ignore' if defined $lastrebase; push @logdata, ($lastrebase = ['rebase', $1]);