diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:24 +0900 |
| commit | bf6136cab899cd7a9937378770017a98a745b33d (patch) | |
| tree | db469f7d64b4f6677de0cb732a4b536d6384b52d | |
| parent | Merge branch 'rs/trace2-dst-warning' (diff) | |
| parent | grep: use return value of strbuf_detach() (diff) | |
| download | git-bf6136cab899cd7a9937378770017a98a745b33d.tar.gz git-bf6136cab899cd7a9937378770017a98a745b33d.zip | |
Merge branch 'rs/strbuf-detach'
Straighten out the use of strbuf_detach() API function.
* rs/strbuf-detach:
grep: use return value of strbuf_detach()
log-tree: always use return value of strbuf_detach()
| -rw-r--r-- | builtin/grep.c | 4 | ||||
| -rw-r--r-- | log-tree.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 2699001fbd..69ac053acc 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1110,8 +1110,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) strbuf_addf(&buf, "+/%s%s", strcmp("less", pager) ? "" : "*", opt.pattern_list->pattern); - string_list_append(&path_list, buf.buf); - strbuf_detach(&buf, NULL); + string_list_append(&path_list, + strbuf_detach(&buf, NULL)); } } diff --git a/log-tree.c b/log-tree.c index 1e56df62a7..109c212224 100644 --- a/log-tree.c +++ b/log-tree.c @@ -677,9 +677,7 @@ void show_log(struct rev_info *opt) raw = (opt->commit_format == CMIT_FMT_USERFORMAT); format_display_notes(&commit->object.oid, ¬ebuf, get_log_output_encoding(), raw); - ctx.notes_message = notebuf.len - ? strbuf_detach(¬ebuf, NULL) - : xcalloc(1, 1); + ctx.notes_message = strbuf_detach(¬ebuf, NULL); } /* |