Commit a5e0bf35 authored by Wayne Davison's avatar Wayne Davison

Properly handle a new patch-branch that is only available locally.

parent 99ba99c7
......@@ -55,19 +55,21 @@ if ($incl_generated_files) {
}
my $last_touch = time;
my(@patches, %local_patch);
my(%patches, %local_patch);
# Start by finding all patches so that we can load all possible parents.
open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
while (<PIPE>) {
if (m# origin/patch/(.*)#) {
push(@patches, $1);
$patches{$1} = 1;
} elsif (m# patch/(.*)#) {
$local_patch{$1} = 1;
$patches{$1} = $local_patch{$1} = 1;
}
}
close PIPE;
my @patches = sort keys %patches;
my(%parent, %description);
foreach my $patch (@patches) {
my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment