]> de.git.xonotic.org Git - xonotic/div0-gittools.git/blobdiff - git-branch-manager
remove some warning mess
[xonotic/div0-gittools.git] / git-branch-manager
index 78a6d065255dbe03c6f92e1711a1843b8de3f9f4..a43225da023dc7b55f1ef25320f7f36cfb22abac 100755 (executable)
@@ -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]);