Re: [PATCH] --amend Rename --pretty=changelog to --pretty=gnucl

From: Junio C Hamano <junkio@cox.net>
Date: Mar 3, 2007, 12:38 UTC
Message-ID: <7v649icxis.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vslcoghcd.fsf@assigned-by-dhcp.cox.net>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 9 quoted lines

> Earlier, this code played dumb by outputting the file name and the comma
> separately (to make it easier to determine when to output a colon
> instead of the comma). This misguided code is fixed by this patch.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>
> 	I know that this is a dead topic branch, but I did not want
> 	to leave buggy code behind for future reference.

Huh?  How did you measure bugginess before and after the change?

$ ./git show -s --pretty=gnucl ':/convert object type h' 2007-02-26 Nicolas Pitre <nico@cam.org>

* archive-tar.c, archive-zip.c, blob.c, builtin-apply.c, 
          uiltin-blame.c, builtin-cat-file.c, builtin-commit-tree.c, 
          uiltin-for-each-ref.c, builtin-grep.c, builtin-log.c, 
          uiltin-pack-objects.c, builtin-prune.c, builtin-reflog.c, 
          uiltin-unpack-objects.c, cache.h, combine-diff.c, commit.c, 
          onvert-objects.c, diff.c, entry.c, fast-import.c, http-push.c, 
          ndex-pack.c, merge-file.c, merge-recursive.c, merge-tree.c, 
          ktag.c, mktree.c, object.c, object.h, pack-check.c, read-cache.c,
          sha1_file.c, tag.c, tree-diff.c, tree.c, unpack-file.c: convert
          object type handling from a string to a number

Perhaps you would want something like this...

diff --git a/utf8.c b/utf8.c
index ea23a6e..3a7b923 100644
--- a/utf8.c
+++ b/utf8.c
@@ -268,7 +268,9 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
 			}
 			else {
 				putchar('\n');
-				text = bol = space + 1;
+				if (isspace(*space))
+					space++;
+				text = bol = space;
 				space = NULL;
 				w = indent = indent2;
 			}