Merge branch 'nd/pretty-formats'

* nd/pretty-formats: pretty: Fix bug in truncation support for %>, %< and %><
git-mirror · Apr 28, 2013 · c85f0a2 · c85f0a2
2 parents a6fed65 + 980419b
commit c85f0a2
Showing 1 changed file with 2 additions and 2 deletions.
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)