Merge branch 'jk/remove-deprecated'

diff --git a/notes-utils.c b/notes-utils.c
index 9107c379d905042807638c728ddeb52679c98e2a..7bb3473dbe44c1f8325ee6891620eec67163dfcd 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -18,7 +18,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
                unsigned char parent_sha1[20];
                if (!read_ref(t->ref, parent_sha1)) {
                        struct commit *parent = lookup_commit(parent_sha1);
-                       if (!parent || parse_commit(parent))
+                       if (parse_commit(parent))
                                die("Failed to find/parse commit %s", t->ref);
                        commit_list_insert(parent, &parents);
                }