diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:38 -0700 |
| commit | 92ccd7b7529a852583c5033ba28b4414cd2f7654 (patch) | |
| tree | bce1548bcd2cd806a4524b812fb56f19b397b7d2 /builtin/notes.c | |
| parent | Merge branch 'rs/avoid-null-statement-after-macro-call' (diff) | |
| parent | cocci: allow xcalloc(1, size) (diff) | |
| download | git-92ccd7b7529a852583c5033ba28b4414cd2f7654.tar.gz git-92ccd7b7529a852583c5033ba28b4414cd2f7654.zip | |
Merge branch 'rs/calloc-array'
CALLOC_ARRAY() macro replaces many uses of xcalloc().
* rs/calloc-array:
cocci: allow xcalloc(1, size)
use CALLOC_ARRAY
git-compat-util.h: drop trailing semicolon from macro definition
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 08b8914d29..74bba39ca8 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -730,7 +730,7 @@ static int merge_commit(struct notes_merge_options *o) else oidclr(&parent_oid); - t = xcalloc(1, sizeof(struct notes_tree)); + CALLOC_ARRAY(t, 1); init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0); o->local_ref = local_ref_to_free = |