Browse Source

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

Code cleanup.

* cb/notes-freeing-always-null-fix:
  builtin/notes: remove unnecessary free
maint
Junio C Hamano 6 years ago
parent
commit
e14af5f7aa
  1. 4
      builtin/notes.c

4
builtin/notes.c

@ -261,10 +261,8 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset) @@ -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);

Loading…
Cancel
Save