proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 18:38:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revparse: Simplify error handling

Browse Source
This commit is contained in:
nulltoken 2013-09-07 17:31:30 +02:00
parent a8d67afe42
commit 1634df8c28
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/revparse.c
View File

@ -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(
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);