From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:57 +0000 (+0900)
Subject: Merge branch 'cb/notes-freeing-always-null-fix'
X-Git-Tag: v2.20.0-rc0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e14af5f7aa31e4377ac016b8df83ec70de8899fd?hp=0de3a73eb6b36d5b8df82e62dd5679462f19edef

Merge branch 'cb/notes-freeing-always-null-fix'

Code cleanup.

* cb/notes-freeing-always-null-fix:
builtin/notes: remove unnecessary free
---

diff --git a/builtin/notes.c b/builtin/notes.c
index 91faa514aa..c78b7a0c5b 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -261,10 +261,8 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
 
 	if (get_oid(arg, &object))
 		die(_("failed to resolve '%s' as a valid ref."), arg);
-	if (!(buf = read_object_file(&object, &type, &len))) {
-		free(buf);
+	if (!(buf = read_object_file(&object, &type, &len)))
 		die(_("failed to read object '%s'."), arg);
-	}
 	if (type != OBJ_BLOB) {
 		free(buf);
 		die(_("cannot read note data from non-blob object '%s'."), arg);