tg-export: implement skipping empty patches for quilt mode

addionally fix the README item for skipping the export of empty patches
not to need an option (-n) as this should be the default.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: martin f. krafft <madduck@debian.org>

diff --git a/README b/README
index 5bfe3ee14793c9591e78095e213039de3847d0ea..aa1f21d88e9c345e7a1d4a01ae3ed24b28c8ee57 100644 (file)
--- a/README
+++ b/README
@@ -414,7 +414,7 @@ tg export
        TODO: Make stripping of non-essential headers configurable
        TODO: Make stripping of [PATCH] and other prefixes configurable
        TODO: --mbox option for other mode of operation
-       TODO: -n option to prevent exporting of empty patches
+       TODO: prevent exporting of empty patches by the collapse driver
        TODO: -a option to export all branches
        TODO: For quilt exporting, use a temporary branch and remove it when
              done - this would allow producing conflict-less series

diff --git a/tg-export.sh b/tg-export.sh
index 90a76d50fb7e35ed0048cc64a83b780d53727588..afb6f95ce288fa95825d09a3da87c96366c1f532 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -140,10 +140,14 @@ quilt()
                return
        fi
 
-       echo "Exporting $_dep"
-       mkdir -p "$(dirname "$filename")"
-       $tg patch "$_dep" >"$filename"
-       echo "$_dep.diff -p1" >>"$output/series"
+       if branch_empty "$_dep"; then
+               echo "Skip empty patch $_dep";
+       else
+               echo "Exporting $_dep"
+               mkdir -p "$(dirname "$filename")"
+               $tg patch "$_dep" >"$filename"
+               echo "$_dep.diff -p1" >>"$output/series"
+       fi
 }