mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
rebase-update-refs: extract load_branch_decorations
Extract load_branch_decorations from todo_list_add_update_ref_commands so it can be re-used in make_script_with_merges. Since it can now be called multiple times, use non-static lists and place it next to load_ref_decorations to re-use the decoration_loaded guard. Signed-off-by: Nicolas Guichard <nicolas@guichard.eu> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
e4d03b7938
commit
68c9fcb027
21
log-tree.c
21
log-tree.c
@@ -248,6 +248,27 @@ void load_ref_decorations(struct decoration_filter *filter, int flags)
|
||||
}
|
||||
}
|
||||
|
||||
void load_branch_decorations(void)
|
||||
{
|
||||
if (!decoration_loaded) {
|
||||
struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
|
||||
struct string_list decorate_refs_exclude_config = STRING_LIST_INIT_NODUP;
|
||||
struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
|
||||
struct decoration_filter decoration_filter = {
|
||||
.include_ref_pattern = &decorate_refs_include,
|
||||
.exclude_ref_pattern = &decorate_refs_exclude,
|
||||
.exclude_ref_config_pattern = &decorate_refs_exclude_config,
|
||||
};
|
||||
|
||||
string_list_append(&decorate_refs_include, "refs/heads/");
|
||||
load_ref_decorations(&decoration_filter, 0);
|
||||
|
||||
string_list_clear(&decorate_refs_exclude, 0);
|
||||
string_list_clear(&decorate_refs_exclude_config, 0);
|
||||
string_list_clear(&decorate_refs_include, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void show_parents(struct commit *commit, int abbrev, FILE *file)
|
||||
{
|
||||
struct commit_list *p;
|
||||
|
||||
Reference in New Issue
Block a user