Commit 1634df8c by nulltoken

revparse: Simplify error handling

parent a8d67afe
...@@ -93,11 +93,7 @@ static int revparse_lookup_object( ...@@ -93,11 +93,7 @@ static int revparse_lookup_object(
int error; int error;
git_reference *ref; git_reference *ref;
error = maybe_sha(object_out, repo, spec); if ((error = maybe_sha(object_out, repo, spec)) != GIT_ENOTFOUND)
if (!error)
return 0;
if (error < 0 && error != GIT_ENOTFOUND)
return error; return error;
error = git_reference_dwim(&ref, repo, spec); error = git_reference_dwim(&ref, repo, spec);
...@@ -112,18 +108,14 @@ static int revparse_lookup_object( ...@@ -112,18 +108,14 @@ static int revparse_lookup_object(
return error; return error;
} }
if (error < 0 && error != GIT_ENOTFOUND) if (error != GIT_ENOTFOUND)
return error; return error;
if ((strlen(spec) < GIT_OID_HEXSZ) && if ((strlen(spec) < GIT_OID_HEXSZ) &&
((error = maybe_abbrev(object_out, repo, spec)) != GIT_ENOTFOUND)) ((error = maybe_abbrev(object_out, repo, spec)) != GIT_ENOTFOUND))
return error; return error;
error = maybe_describe(object_out, repo, spec); if ((error = maybe_describe(object_out, repo, spec)) != GIT_ENOTFOUND)
if (!error)
return 0;
if (error < 0 && error != GIT_ENOTFOUND)
return error; return error;
giterr_set(GITERR_REFERENCE, "Revspec '%s' not found.", spec); giterr_set(GITERR_REFERENCE, "Revspec '%s' not found.", spec);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment