+ my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
+ open(PIPE, '-|', 'git-diff', "master...$branch", '--', "PATCH.$patch") or die $!;
+ while (<PIPE>) {
+ last if /^@@ /;
+ }
+ my $desc = '';
+ while (<PIPE>) {
+ next if /^-/; # huh??
+ s/^.//;
+ if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
+ $parent{$patch} = $1;
+ }
+ $desc .= $_;
+ }
+ $description{$patch} = $desc;
+}
+
+my %completed;
+foreach my $patch (@patches) {
+ next if $completed{$patch}++;
+ update_patch($patch);
+}
+
+if ($incl_generated_files) {
+ system "rm -rf a b";
+}
+
+print "-------- master --------\n";
+sleep 1 if $last_touch == time;
+system "git-checkout master && ./prepare-source";
+
+exit;
+
+
+sub update_patch
+{
+ my($patch) = @_;
+
+ my $parent = $parent{$patch};
+ if (defined $parent) {
+ unless ($completed{$parent}++) {
+ update_patch($parent);
+ }
+ $parent = "patch/$parent";
+ } else {
+ $parent = 'master';
+ }
+