diff options
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/checkout.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index a63935cc83..8e9ac1144d 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2150,7 +2150,7 @@ static void am_abort(struct am_state *state) am_rerere_clear(); curr_branch = resolve_refdup("HEAD", 0, curr_head.hash, NULL); - has_curr_head = !is_null_oid(&curr_head); + has_curr_head = curr_branch && !is_null_oid(&curr_head); if (!has_curr_head) hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN); diff --git a/builtin/checkout.c b/builtin/checkout.c index bfa5419f33..6c3d2e4f4c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -833,7 +833,8 @@ static int switch_branches(const struct checkout_opts *opts, int flag, writeout_error = 0; memset(&old, 0, sizeof(old)); old.path = path_to_free = resolve_refdup("HEAD", 0, rev.hash, &flag); - old.commit = lookup_commit_reference_gently(rev.hash, 1); + if (old.path) + old.commit = lookup_commit_reference_gently(rev.hash, 1); if (!(flag & REF_ISSYMREF)) old.path = NULL; |