diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-05 13:48:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-05 13:48:19 +0900 |
| commit | efe9d6ce33ed817150f4ff63ebfc14a3f7667eb4 (patch) | |
| tree | 445ad62e5235a01002086d2009b35fb9cc16af96 /builtin | |
| parent | Merge branch 'er/fast-import-dump-refs-on-checkpoint' (diff) | |
| parent | refs: pass NULL to resolve_refdup() if hash is not needed (diff) | |
| download | tgif-efe9d6ce33ed817150f4ff63ebfc14a3f7667eb4.tar.xz | |
Merge branch 'rs/resolve-ref-optional-result'
Code clean-up.
* rs/resolve-ref-optional-result:
refs: pass NULL to resolve_refdup() if hash is not needed
refs: pass NULL to refs_resolve_refdup() if hash is not needed
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 3 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3345a0d16f..10751585ea 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1124,9 +1124,8 @@ static int checkout_branch(struct checkout_opts *opts, if (new->path && !opts->force_detach && !opts->new_branch && !opts->ignore_other_worktrees) { - struct object_id oid; int flag; - char *head_ref = resolve_refdup("HEAD", 0, oid.hash, &flag); + char *head_ref = resolve_refdup("HEAD", 0, NULL, &flag); if (head_ref && (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path))) die_if_checked_out(new->path, 1); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 29a0f3b75f..cc48767405 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1458,7 +1458,6 @@ static void execute_commands(struct command *commands, { struct check_connected_options opt = CHECK_CONNECTED_INIT; struct command *cmd; - struct object_id oid; struct iterate_data data; struct async muxer; int err_fd = 0; @@ -1515,7 +1514,7 @@ static void execute_commands(struct command *commands, check_aliased_updates(commands); free(head_name_to_free); - head_name = head_name_to_free = resolve_refdup("HEAD", 0, oid.hash, NULL); + head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL); if (use_atomic) execute_commands_atomic(commands, si); |