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

Conflicts:
	tg-export.sh

diff --cc tg-export.sh
index ae32bf48f6cde617cc31d919395cf598b68102f6,748ca54f6c093480684d53982ba72e82daedb412..90f7c6a6dfcf739a6f89061e4e89f33aa810a292
--- 1/tg-export.sh
--- 2/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
  
 -      name="$1"
+       (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()
+ {
++      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