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

fetch: use goto cleanup in cmd_fetch()

Browse Source 
Replace an early return with 'goto cleanup' in cmd_fetch() so that the
string_list is always cleared (the string_list_clear() call is purely
cleanup; the string_list is not reused). This makes cleanup consistent
so that a subsequent commit can use 'goto cleanup' to bail out early.

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Glen Choo 2022-01-18 16:00:54 -08:00 committed by Junio C Hamano
parent 69a9c10c95
commit bec587d4c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/fetch.c
View File

@ -2076,7 +2076,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
gtransport->smart_options->acked_commits = &acked_commits;
} else {
warning(_("Protocol does not support --negotiate-only, exiting."));
return 1;
result = 1;
goto cleanup;
}
if (server_options.nr)
gtransport->server_options = &server_options;
@ -2132,8 +2133,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
strvec_clear(&options);
}
string_list_clear(&list, 0);
prepare_repo_settings(the_repository);
if (fetch_write_commit_graph > 0 ||
(fetch_write_commit_graph < 0 &&
@ -2151,5 +2150,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
if (enable_auto_gc)
run_auto_maintenance(verbosity < 0);
cleanup:
string_list_clear(&list, 0);
return result;
}