summaryrefslogtreecommitdiff
path: root/Porting/makerel
diff options
context:
space:
mode:
Diffstat (limited to 'Porting/makerel')
-rwxr-xr-xPorting/makerel5
1 files changed, 3 insertions, 2 deletions
diff --git a/Porting/makerel b/Porting/makerel
index 082c9e5720..3fe610f1b2 100755
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -62,8 +62,9 @@ $vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
# fetch list of local patches
my (@local_patches, @lpatch_tags, $lpatch_tags);
-@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
-@local_patches = grep { !/^\s*,?NULL/ } @local_patches;
+@local_patches = grep { !/^\s*,?NULL/ && ! /,"uncommitted-changes"/ }
+ grep { /^static.*local_patches/../^};/ }
+ @patchlevel_h;
@lpatch_tags = map { /^\s*,"(\w+)/ } @local_patches;
$lpatch_tags = join "-", @lpatch_tags;