From 3d1ab25e00d2f628ad885089767f586e99e2dc28 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Aug 2009 18:14:15 -0700
Subject: [PATCH] cook: Move temporaries one level down

---
 cook.sh | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/cook.sh b/cook.sh
index 4d5864281e..8cba79ca4d 100755
--- a/cook.sh
+++ b/cook.sh
@@ -3,8 +3,10 @@
 LANG=C LC_ALL=C GIT_PAGER=cat
 export LANG LC_ALL GIT_PAGER
 
-tmp=/var/tmp/cook.$$
-trap 'rm -f "$tmp".*' 0
+tmpdir=/var/tmp/cook.$$
+mkdir "$tmpdir" || exit
+tmp="$tmpdir/t"
+trap 'rm -fr "$tmpdir"' 0
 
 git branch --merged "master" | sed -n -e 's/^..//' -e '/\//p' >"$tmp.in.master"
 git branch --merged "pu" | sed -n -e 's/^..//' -e '/\//p' >"$tmp.in.pu"
@@ -245,8 +247,22 @@ perl -w -e '
 	my $incremental = $ARGV[1] eq "yes";
 	my $last_empty = undef;
 	my (@section, %section, @branch, %branch, %description, @leader);
+	my $in_unedited_olde = 0;
 
 	while (<STDIN>) {
+		if ($in_unedited_olde) {
+			if (/^>>$/) {
+				$in_unedited_olde = 0;
+				$_ = " | $_";
+			}
+		} elsif (/^<<$/) {
+			$in_unedited_olde = 1;
+		}
+
+		if ($in_unedited_olde) {
+			$_ = " | $_";
+		}
+
 		if (defined $section && /^-{20,}$/) {
 			$_ = "\n";
 		}
@@ -296,6 +312,7 @@ perl -w -e '
 				push @section, $section;
 				$section{$section} = [];
 			}
+			push @{$section{$section}}, $branch;
 			push @branch, [$branch, $section];
 			$branch{$branch} = (scalar @branch) - 1;
 			if (!exists $description{$branch}) {
-- 
2.11.4.GIT