mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/code-cleaning'

Browse Source 
* rs/code-cleaning:
  fsck: simplify fsck_commit_buffer() by using commit_list_count()
  commit: use commit_list_append() instead of duplicating its code
  merge: simplify merge_trivial() by using commit_list_append()
  use strbuf_addch for adding single characters
  use strbuf_addbuf for adding strbufs
This commit is contained in:
Junio C Hamano
2014-07-16 11:33:09 -07:00
parent f357797678 9d02150cf4
commit 1fc83452c7
10 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pretty.c
View File

@ -1376,7 +1376,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
case trunc_none:
break;
}
strbuf_addstr(sb, local_sb.buf);
strbuf_addbuf(sb, &local_sb);
} else {
int sb_len = sb->len, offset = 0;
if (c->flush_type == flush_left)