diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-08-27 01:37:56 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-27 15:33:40 -0700 |
| commit | 2b318aa6c3566ad65d9547f42828f277955e6519 (patch) | |
| tree | 9bcebc2372ae4d795c96dd57ab9ee299d9a08fe9 /builtin | |
| parent | t3432: test for --no-ff's interaction with fast-forward (diff) | |
| download | tgif-2b318aa6c3566ad65d9547f42828f277955e6519.tar.xz | |
rebase: refactor can_fast_forward into goto tower
Before, can_fast_forward was written with an if-else statement. However,
in the future, we may be adding more termination cases which would lead
to deeply nested if statements.
Refactor to use a goto tower so that future cases can be easily
inserted.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 670096c065..1ddad46126 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1264,20 +1264,25 @@ static int can_fast_forward(struct commit *onto, struct object_id *head_oid, struct object_id *merge_base) { struct commit *head = lookup_commit(the_repository, head_oid); - struct commit_list *merge_bases; - int res; + struct commit_list *merge_bases = NULL; + int res = 0; if (!head) - return 0; + goto done; merge_bases = get_merge_bases(onto, head); - if (merge_bases && !merge_bases->next) { - oidcpy(merge_base, &merge_bases->item->object.oid); - res = oideq(merge_base, &onto->object.oid); - } else { + if (!merge_bases || merge_bases->next) { oidcpy(merge_base, &null_oid); - res = 0; + goto done; } + + oidcpy(merge_base, &merge_bases->item->object.oid); + if (!oideq(merge_base, &onto->object.oid)) + goto done; + + res = 1; + +done: free_commit_list(merge_bases); return res && is_linear_history(onto, head); } |