From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Dec 2007 09:09:38 +0000 (-0800)
Subject: UWC: do not lose description for graduated topics
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3cd72a090309b93f19ced44959f3a327d1e794c;p=thirdparty%2Fgit.git

UWC: do not lose description for graduated topics
---

diff --git a/UWC b/UWC
index 16597159e9..8f3bfb2535 100755
--- a/UWC
+++ b/UWC
@@ -97,7 +97,7 @@ sub parse_whats_cooking {
 			next;
 		}
 
-		if (/^ [-+.?] / || /^   \S/) {
+		if (/^ [-+.?*] / || /^   \S/) {
 			$topic->{"names"} .= $_;
 			next;
 		}
@@ -151,8 +151,12 @@ sub merge_whats_cooking {
 			my $newtopic = delete $new_wc->{"topic hash"}{$name};
 
 			if (!defined $newtopic) {
+				$topic->{"text"} = ("<<deleted\n" .
+						    $topic->{"head"} .
+						    $topic->{"names"} .
+						    ">>\n\n" .
+						    $topic->{"text"});
 				$topic->{"names"} = "";
-				$topic->{"text"} = "<<deleted>>";
 				next;
 			}
 			if (($newtopic->{"names"} ne $topic->{"names"}) ||