diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:56 +0900 |
| commit | 73ecdc606eedbfd98ec66d50d44b3374425fd13b (patch) | |
| tree | 6a2aeb6eb0b30e1645c8af06b10c9f4ec2815dd8 /revision.c | |
| parent | 2812ca7f0e11f6a46c8b1b5b4450df20412c22be (diff) | |
| parent | 744c040b19412fa5075810eb1aced105fad96726 (diff) | |
| download | git-73ecdc606eedbfd98ec66d50d44b3374425fd13b.tar.gz | |
Merge branch 'rs/resolve-ref-optional-result'
Code clean-up.
* rs/resolve-ref-optional-result:
refs: pass NULL to resolve_ref_unsafe() if hash is not needed
refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed
refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 1520f69d93..613168d397 100644 --- a/revision.c +++ b/revision.c @@ -2248,11 +2248,10 @@ static int handle_revision_pseudo_opt(const char *submodule, static void NORETURN diagnose_missing_default(const char *def) { - unsigned char sha1[20]; int flags; const char *refname; - refname = resolve_ref_unsafe(def, 0, sha1, &flags); + refname = resolve_ref_unsafe(def, 0, NULL, &flags); if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN)) die(_("your current branch appears to be broken")); |