diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:33:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:33:09 -0700 |
| commit | 1fc83452c76e65385b3da69ea94eb957e36e6c78 (patch) | |
| tree | 6d6105b9a9fed643036df3d0fceabde1ab1479c7 /sha1_name.c | |
| parent | f357797678aa5ae35c63623b8b76eb682d5b9b79 (diff) | |
| parent | 9d02150cf4d833935161ef265e4dc03807caa800 (diff) | |
| download | git-1fc83452c76e65385b3da69ea94eb957e36e6c78.tar.gz | |
Merge branch 'rs/code-cleaning'
* 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
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index 5bfa841699..6ccd3a53f8 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -946,7 +946,7 @@ static int interpret_nth_prior_checkout(const char *name, int namelen, retval = 0; if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) { strbuf_reset(buf); - strbuf_add(buf, cb.buf.buf, cb.buf.len); + strbuf_addbuf(buf, &cb.buf); retval = brace - name + 1; } |