undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: consolidate clean-up code before leaving reset_head()

Browse Source 
The same clean-up code is repeated quite a few times; Let's DRY up the
code some.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-11-12 03:44:30 -08:00 committed by Junio C Hamano
parent 8858448bb4
commit 3249c1251e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/rebase.c
View File

@ -541,13 +541,15 @@ static int reset_head(struct object_id *oid, const char *action,
if (switch_to_branch && !starts_with(switch_to_branch, "refs/")) if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
BUG("Not a fully qualified branch: '%s'", switch_to_branch); BUG("Not a fully qualified branch: '%s'", switch_to_branch);
if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
return -1; ret = -1;
goto leave_reset_head;
}
if (!oid) { if (!oid) {
if (get_oid("HEAD", &head_oid)) { if (get_oid("HEAD", &head_oid)) {
rollback_lock_file(&lock); ret = error(_("could not determine HEAD revision"));
return error(_("could not determine HEAD revision")); goto leave_reset_head;
} }
oid = &head_oid; oid = &head_oid;
} }
@ -564,32 +566,27 @@ static int reset_head(struct object_id *oid, const char *action,
unpack_tree_opts.reset = 1; unpack_tree_opts.reset = 1;
if (read_index_unmerged(the_repository->index) < 0) { if (read_index_unmerged(the_repository->index) < 0) {
rollback_lock_file(&lock); ret = error(_("could not read index"));
return error(_("could not read index")); goto leave_reset_head;
} }
if (!fill_tree_descriptor(&desc, oid)) { if (!fill_tree_descriptor(&desc, oid)) {
error(_("failed to find tree of %s"), oid_to_hex(oid)); ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
rollback_lock_file(&lock); goto leave_reset_head;
free((void *)desc.buffer);
return -1;
} }
if (unpack_trees(1, &desc, &unpack_tree_opts)) { if (unpack_trees(1, &desc, &unpack_tree_opts)) {
rollback_lock_file(&lock); ret = -1;
free((void *)desc.buffer); goto leave_reset_head;
return -1;
} }
tree = parse_tree_indirect(oid); tree = parse_tree_indirect(oid);
prime_cache_tree(the_repository->index, tree); prime_cache_tree(the_repository->index, tree);
if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) {
ret = error(_("could not write index")); ret = error(_("could not write index"));
free((void *)desc.buffer); goto leave_reset_head;
}
if (ret)
return ret;
reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT); reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase"); strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
@ -622,7 +619,10 @@ static int reset_head(struct object_id *oid, const char *action,
UPDATE_REFS_MSG_ON_ERR); UPDATE_REFS_MSG_ON_ERR);
} }
leave_reset_head:
strbuf_release(&msg); strbuf_release(&msg);
rollback_lock_file(&lock);
free((void *)desc.buffer);
return ret; return ret;
} }