# 
# 
# patch "ChangeLog"
#  from [6aaff09e173bf4c9a213703d1c69e14611412665]
#    to [9db7851a1c3cfa87b83a0cc8292007b3eee5f70b]
# 
# patch "commands.cc"
#  from [476c551a6311ecb8c6cf4d69665a63a258ad8eb3]
#    to [15ff224cde8ed5fe79cbd2f3fa3863b9eb3ef8d6]
# 
============================================================
--- ChangeLog	6aaff09e173bf4c9a213703d1c69e14611412665
+++ ChangeLog	9db7851a1c3cfa87b83a0cc8292007b3eee5f70b
@@ -1,5 +1,10 @@ 2006-10-26  Richard Levitte  <address@hidden
 2006-10-26  Richard Levitte  <address@hidden>
 
+	* commands.cc (process_commit_message_args): Only prepend the
+	message prefix is it's more than 0 characters.
+
+2006-10-26  Richard Levitte  <address@hidden>
+
 	* cmd_ws_commit.cc (CMD(disapprove)): Make it possible to specify
 	extra message lines to be added after the standard "disapprove"
 	line, as well as author and date.  Makes use of the following
============================================================
--- commands.cc	476c551a6311ecb8c6cf4d69665a63a258ad8eb3
+++ commands.cc	15ff224cde8ed5fe79cbd2f3fa3863b9eb3ef8d6
@@ -460,7 +460,10 @@ process_commit_message_args(bool & given
 
   if (app.is_explicit_option(option::message()))
     {
-      log_message = message_prefix() + "\n\n" + app.message();
+      if (message_prefix().length() != 0)
+        log_message = message_prefix() + "\n\n" + app.message();
+      else
+        log_message = app.message();
       given = true;
     }
   else if (app.is_explicit_option(option::msgfile()))
@@ -469,7 +472,8 @@ process_commit_message_args(bool & given
       read_data_for_command_line(app.message_file(), dat);
       external dat2 = dat();
       system_to_utf8(dat2, log_message);
-      log_message = message_prefix() + "\n\n" + log_message();
+      if (message_prefix().length() != 0)
+        log_message = message_prefix() + "\n\n" + log_message();
       given = true;
     }
   else if (message_prefix().length() != 0)