git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tg export: implement skipping empty patches for quilt mode
@ 2008-11-24 21:56 Uwe Kleine-König
  2008-11-25  8:45 ` martin f krafft
  0 siblings, 1 reply; 9+ messages in thread
From: Uwe Kleine-König @ 2008-11-24 21:56 UTC (permalink / raw)
  To: git; +Cc: martin f. krafft, Petr Baudis

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: martin f. krafft <madduck@debian.org>
Cc: Petr Baudis <pasky@suse.cz>
---
 tg-export.sh |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tg-export.sh b/tg-export.sh
index 52af88d..6f1d226 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -7,6 +7,7 @@ name=
 branches=
 output=
 driver=collapse
+skipempty=false
 
 
 ## Parse options
@@ -20,6 +21,8 @@ while [ -n "$1" ]; do
 		driver=quilt;;
 	--collapse)
 		driver=collapse;;
+	-n)
+		skipempty=true;;
 	-*)
 		echo "Usage: tg [...] export ([--collapse] NEWBRANCH | [-b BRANCH1,BRANCH2...] --quilt DIRECTORY)" >&2
 		exit 1;;
@@ -34,6 +37,9 @@ done
 [ -z "$branches" -o "$driver" = "quilt" ] ||
 	die "-b works only with the quilt driver"
 
+! "$skipempty" || [ "$driver" = "quilt" ] ||
+	die "-n is only implemented for the quilt driver"
+
 if [ -z "$branches" ]; then
 	# this check is only needed when no branches have been passed
 	name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
@@ -140,10 +146,14 @@ quilt()
 		return
 	fi
 
-	echo "Exporting $_dep"
-	mkdir -p "$(dirname "$filename")"
-	$tg patch "$_dep" >"$filename"
-	echo "$_dep.diff -p1" >>"$output/series"
+	if "$skipempty" && 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
 }
 
 
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
[parent not found: <20081126102507.GA29100@piper.oerlikon.madduck.net>]
* [PATCH] tg export: implement skipping empty patches for quilt mode
@ 2008-11-26 12:13 Uwe Kleine-König
  2008-11-26 20:39 ` martin f krafft
  0 siblings, 1 reply; 9+ messages in thread
From: Uwe Kleine-König @ 2008-11-26 12:13 UTC (permalink / raw)
  To: martin f krafft; +Cc: git

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>
---
 README       |    2 +-
 tg-export.sh |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 5bfe3ee..9b92d43 100644
--- 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
 	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 52af88d..f133fb8 100644
--- 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
 }
 
 
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-11-26 21:20 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-24 21:56 [PATCH] tg export: implement skipping empty patches for quilt mode Uwe Kleine-König
2008-11-25  8:45 ` martin f krafft
2008-11-25 20:54   ` Uwe Kleine-König
2008-11-26  9:25     ` martin f krafft
2008-11-26  9:47       ` Uwe Kleine-König
     [not found] <20081126102507.GA29100@piper.oerlikon.madduck.net>
2008-11-26 12:12 ` Uwe Kleine-König
  -- strict thread matches above, loose matches on Subject: below --
2008-11-26 12:13 Uwe Kleine-König
2008-11-26 20:39 ` martin f krafft
2008-11-26 21:19   ` Uwe Kleine-König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).