tg export (collapse): implement skipping empty patches

[topgit.git] / tg-export.sh

diff --git a/tg-export.sh b/tg-export.sh
index 52af88dfd14e891627b145f63702b1212155a82c..95aa346ef014af079c40ff8b397d5bee7e1ffa01 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -91,9 +91,13 @@ collapsed_commit()
                        $(for p in $parent; do echo -p $p; done))"
        fi
 
-       (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
-       git stripspace |
-       git commit-tree "$(pretty_tree "$name")" -p "$parent"
+       if branch_empty "$name"; then
+               echo "$parent";
+       else
+               (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
+               git stripspace |
+               git commit-tree "$(pretty_tree "$name")" -p "$parent"
+       fi;
 
        echo "$name" >>"$playground/^ticker"
 }
@@ -140,10 +144,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
 }
 
 
@@ -199,3 +207,5 @@ elif [ "$driver" = "quilt" ]; then
        depcount="$(cat "$output/series" | wc -l)"
        echo "Exported topic branch $name (total $depcount topics) to directory $output"
 fi
+
+# vim:noet