assume parse_commit checks for NULL commit

The parse_commit function will check whether it was passed a
NULL commit pointer, and if so, return an error. There is no
need for callers to check this separately.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index 083689063f66a614ad6f8ee4a84c79e214d1b6e0..8db095f5c28ab6706456fdd21c214f340e1f6707 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -490,7 +490,7 @@ static void add_verbose_info(struct strbuf *out, struct ref_item *item,
        const char *sub = _(" **** invalid ref ****");
        struct commit *commit = item->commit;
 
        const char *sub = _(" **** invalid ref ****");
        struct commit *commit = item->commit;
 

-       if (commit && !parse_commit(commit)) {
+       if (!parse_commit(commit)) {

                pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
                sub = subject.buf;
        }
                pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
                sub = subject.buf;
        }

diff --git a/builtin/commit.c b/builtin/commit.c
index 10acc53f8012f53b6a15a3d006b622bda3409b17..89f65f2b8213f456975082d707e2069f70c67dd9 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1311,7 +1311,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1,
        commit = lookup_commit(sha1);
        if (!commit)
                die(_("couldn't look up newly created commit"));
        commit = lookup_commit(sha1);
        if (!commit)
                die(_("couldn't look up newly created commit"));

-       if (!commit || parse_commit(commit))
+       if (parse_commit(commit))

                die(_("could not parse newly created commit"));
 
        strbuf_addstr(&format, "format:%h] %s");
                die(_("could not parse newly created commit"));
 
        strbuf_addstr(&format, "format:%h] %s");


@@ -1503,7 +1503,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                current_head = NULL;
        else {
                current_head = lookup_commit_or_die(sha1, "HEAD");
                current_head = NULL;
        else {
                current_head = lookup_commit_or_die(sha1, "HEAD");

-               if (!current_head || parse_commit(current_head))
+               if (parse_commit(current_head))

                        die(_("could not parse HEAD commit"));
        }
        argc = parse_and_validate_options(argc, argv, builtin_commit_options,
                        die(_("could not parse HEAD commit"));
        }
        argc = parse_and_validate_options(argc, argv, builtin_commit_options,

diff --git a/commit.c b/commit.c
index 26c1d5406d3b1229ffdd2b152a05dcb601ebe5ca..8535e5cf35bfabe4a9dd0dc19e1caf6fec93531a 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -79,7 +79,7 @@ struct commit *lookup_commit_reference_by_name(const char *name)
        if (get_sha1_committish(name, sha1))
                return NULL;
        commit = lookup_commit_reference(sha1);
        if (get_sha1_committish(name, sha1))
                return NULL;
        commit = lookup_commit_reference(sha1);

-       if (!commit || parse_commit(commit))
+       if (parse_commit(commit))

                return NULL;
        return commit;
 }
                return NULL;
        return commit;
 }

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);
                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);
                }
                                die("Failed to find/parse commit %s", t->ref);
                        commit_list_insert(parent, &parents);
                }

diff --git a/sha1_name.c b/sha1_name.c
index 65ad066d9bb4efd9b61142b40d790bac9543de1d..729ab14a87007b2f64c2bd22cb669075cafb39b6 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -582,8 +582,6 @@ static int get_parent(const char *name, int len,
        if (ret)
                return ret;
        commit = lookup_commit_reference(sha1);
        if (ret)
                return ret;
        commit = lookup_commit_reference(sha1);

-       if (!commit)
-               return -1;

        if (parse_commit(commit))
                return -1;
        if (!idx) {
        if (parse_commit(commit))
                return -1;
        if (!idx) {