]> git.ipfire.org Git - thirdparty/git.git/commitdiff
UWC: do not lose description for graduated topics
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 09:09:38 +0000 (01:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 09:09:38 +0000 (01:09 -0800)
UWC

diff --git a/UWC b/UWC
index 16597159e9046cbe029f707ecabf79ddd99eaa23..8f3bfb2535371de9a0304c3c06ab77b104661419 100755 (executable)
--- 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"}) ||