From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 3 Mar 2009 10:21:56 +0000 (+0100)
Subject: Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=b42b1c4979ba80da6fe9d48ab2010e5acefb47a3;p=topgit.git

Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps

Conflicts:
	tg-export.sh
---

b42b1c4979ba80da6fe9d48ab2010e5acefb47a3
diff --cc tg-export.sh
index ae32bf4,748ca54..90f7c6a
--- a/tg-export.sh
+++ b/tg-export.sh
@@@ -81,6 -91,20 +97,20 @@@ create_tg_commit(
  	test -n "$GIT_AUTHOR_EMAIL" && export GIT_AUTHOR_EMAIL
  	test -n "$GIT_AUTHOR_DATE" && export GIT_AUTHOR_DATE
  
+ 	(printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
+ 	git stripspace |
+ 	git commit-tree "$tree" -p "$parent"
+ }
+ 
+ # collapsed_commit NAME
+ # Produce a collapsed commit of branch NAME.
+ collapsed_commit()
+ {
 -	name="$1"
++	local name; name="$1"
+ 
+ 	rm -f "$playground/^pre" "$playground/^post"
+ 	>"$playground/^body"
+ 
  	# Determine parent
  	parent="$(cut -f 1 "$playground/$name^parents")"
  	if [ "$(cat "$playground/$name^parents" | wc -l)" -gt 1 ]; then