Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd1f0da
)
Fixed finding of parent's description when @ARGV doesn't mention it.
author
Wayne Davison
<wayned@samba.org>
Mon, 4 Feb 2008 08:12:01 +0000
(
00:12
-0800)
committer
Wayne Davison
<wayned@samba.org>
Mon, 4 Feb 2008 08:12:01 +0000
(
00:12
-0800)
support/patch-update
patch
|
blob
|
blame
|
history
diff --git
a/support/patch-update
b/support/patch-update
index
502380d
..
a76f111
100755
(executable)
--- a/
support/patch-update
+++ b/
support/patch-update
@@
-56,16
+56,9
@@
if ($incl_generated_files) {
my $last_touch = time;
my(@patches, %local_patch);
my $last_touch = time;
my(@patches, %local_patch);
-if (@ARGV) {
- foreach (@ARGV) {
- s{^(patches|patch|origin/patch)/} {};
- s{\.diff$} {};
- push(@patches, $_);
- }
- open(PIPE, '-|', 'git', 'branch', '-l') or die $!;
-} else {
- open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
-}
+
+# 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);
while (<PIPE>) {
if (m# origin/patch/(.*)#) {
push(@patches, $1);
@@
-93,6
+86,16
@@
foreach my $patch (@patches) {
$description{$patch} = $desc;
}
$description{$patch} = $desc;
}
+if (@ARGV) {
+ # Limit the list of patches to actually process based on @ARGV.
+ @patches = ( );
+ foreach (@ARGV) {
+ s{^(patches|patch|origin/patch)/} {};
+ s{\.diff$} {};
+ push(@patches, $_);
+ }
+}
+
my %completed;
foreach my $patch (@patches) {
next if $completed{$patch}++;
my %completed;
foreach my $patch (@patches) {
next if $completed{$patch}++;