Merge branch 'nd/pretty-formats'

gitster · gitster · commit c85f0a2a0e39 · 2013-04-28T12:10:03.000-07:00
* nd/pretty-formats:
  pretty: Fix bug in truncation support for %&gt;, %&lt; and %&gt;&lt;
diff --git a/utf8.c b/utf8.c
@@ -463,8 +463,8 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
 		w += n;
 	}
 	strbuf_setlen(&sb_dst, dst - sb_dst.buf);
-	strbuf_attach(sb_src, strbuf_detach(&sb_dst, NULL),
-		      sb_dst.len, sb_dst.alloc);
+	strbuf_swap(sb_src, &sb_dst);
+	strbuf_release(&sb_dst);
 }
 
 int is_encoding_utf8(const char *name)

Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,8 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,`
`463`	`463`	`w += n;`
`464`	`464`	`}`
`465`	`465`	`strbuf_setlen(&sb_dst, dst - sb_dst.buf);`
`466`		`- strbuf_attach(sb_src, strbuf_detach(&sb_dst, NULL),`
`467`		`- sb_dst.len, sb_dst.alloc);`
	`466`	`+ strbuf_swap(sb_src, &sb_dst);`
	`467`	`+ strbuf_release(&sb_dst);`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`int is_encoding_utf8(const char *name)`