Merge branch 'nv/parseopt-opt-arg'

diff --git a/sha1_name.c b/sha1_name.c
index 0e5fe7f9371d2e6ae5aa9ce99c4b6c2dfb7a456f..2f37488b96c0a8485e90d87befa997d75ba4b7b1 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
        return status;
 }
 
-
 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
 {
        char hex_pfx[40];
@@ -582,8 +581,6 @@ static int get_parent(const char *name, int len,
        if (ret)
                return ret;
        commit = lookup_commit_reference(sha1);
-       if (!commit)
-               return -1;
        if (parse_commit(commit))
                return -1;
        if (!idx) {