]> git.sur5r.net Git - u-boot/commitdiff
patman: Add -a option to refrain from test-applying the patches
authorSimon Glass <sjg@chromium.org>
Tue, 26 Mar 2013 13:09:43 +0000 (13:09 +0000)
committerSimon Glass <sjg@chromium.org>
Mon, 8 Apr 2013 22:21:22 +0000 (15:21 -0700)
Especially with the Linux kernel, it takes a long time (a minute or more)
to test-apply the patches, so patman becomes significantly less useful.
The only real problem that is found with this apply step is trailing spaces.
Provide a -a option to skip this step, for those working with clean patches.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
tools/patman/patman.py

index 23026becd00683ce5eaadbf28f181e09ea89fa6d..a8061a9372181d99db5d48e26bf9ac06f74d8138 100755 (executable)
@@ -41,6 +41,9 @@ import test
 
 
 parser = OptionParser()
+parser.add_option('-a', '--no-apply', action='store_false',
+                  dest='apply_patches', default=True,
+                  help="Don't test-apply patches with git am")
 parser.add_option('-H', '--full-help', action='store_true', dest='full_help',
        default=False, help='Display the README file')
 parser.add_option('-c', '--count', dest='count', type='int',
@@ -157,9 +160,10 @@ else:
         ok = checkpatch.CheckPatches(options.verbose, args)
     else:
         ok = True
-    if not gitutil.ApplyPatches(options.verbose, args,
-            options.count + options.start):
-        ok = False
+    if options.apply_patches:
+        if not gitutil.ApplyPatches(options.verbose, args,
+                                    options.count + options.start):
+            ok = False
 
     cc_file = series.MakeCcFile(options.process_tags, cover_fname,
                                 not options.ignore_bad_tags)