* Re: [PATCH v2 3/9] reset: modernize flags passed to `reset_head()`
From: Phillip Wood @ 2026-06-05 15:08 UTC (permalink / raw)
To: Patrick Steinhardt, git; +Cc: Pablo Sabater, Junio C Hamano
In-Reply-To: <20260603-b4-pks-history-drop-v2-3-742cb5b5176d@pks.im>
Hi Patrick
On 03/06/2026 17:14, Patrick Steinhardt wrote:
> -/* Update ORIG_HEAD as well as HEAD */
> -#define RESET_ORIG_HEAD (1<<4)
> [...]> + /* Update ORIG_HEAD as well as HEAD */
> + RESET_HEAD_ORIG_HEAD = (1 << 4),
I'm having a hard time parsing this new name, if we must have a
"RESET_HEAD_" prefix can we call it something like
RESET_HEAD_UPDATE_ORIG_HEAD?
Thanks
Phillip
> +};
>
> struct reset_head_opts {
> /*
> @@ -33,7 +39,7 @@ struct reset_head_opts {
> /*
> * Flags defined above.
> */
> - unsigned flags;
> + enum reset_head_flags flags;
> /*
> * Optional reflog message for branch, defaults to head_msg.
> */
> @@ -45,7 +51,7 @@ struct reset_head_opts {
> const char *head_msg;
> /*
> * Optional reflog message for ORIG_HEAD, if this omitted and flags
> - * contains RESET_ORIG_HEAD then default_reflog_action must be given.
> + * contains RESET_HEAD_ORIG_HEAD then default_reflog_action must be given.
> */
> const char *orig_head_msg;
> /*
> diff --git a/sequencer.c b/sequencer.c
> index 1ee4b2875b..0b89a977b0 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -4870,7 +4870,7 @@ static int checkout_onto(struct repository *r, struct replay_opts *opts,
> struct reset_head_opts ropts = {
> .oid = onto,
> .orig_head = orig_head,
> - .flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD |
> + .flags = RESET_HEAD_DETACH | RESET_HEAD_ORIG_HEAD |
> RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
> .head_msg = reflog_message(opts, "start", "checkout %s",
> onto_name),
>
^ permalink raw reply
* Re: [PATCH v12 4/6] branch: add --prune-merged <branch>
From: Phillip Wood @ 2026-06-05 15:04 UTC (permalink / raw)
To: Harald Nordgren via GitGitGadget, git
Cc: Kristoffer Haugsbakk, Johannes Sixt, Harald Nordgren
In-Reply-To: <629b38ab-42d8-4763-919f-005b6ada68a0@gmail.com>
On 05/06/2026 14:50, Phillip Wood wrote:
>
> I wonder about the name - the other options that delete branches are
> called "delete", not "prune". Also "--prune-merged" does not delete the
> branches listed by "--merged" so maybe "--delete-forked" would be better?
"delete-forked" doesn't capture the fact the branch has been merged
though - I wonder if anyone has a better idea
Thanks
Phillip
> I've not commented in detail on the code as it will need to change a bit
> once we match on full refnames and do the filtering in
> apply_ref_filter() but I think the basics are sound.
>
> I'll stop here - I did quickly scan the next two patches and they both
> looked like sensible ideas.
>
> Thanks
>
> Phillip
>
>> deletes the local branches that "--forked <branch>" would list,
>> restricted to those whose tip is reachable from their configured
>> upstream: the work has already landed on the upstream they track,
>> so the local copy is no longer needed.
>>
>> Reachability is read from local refs; nothing is fetched. Users
>> who want fresh upstream refs run "git fetch" first.
>>
>> Three classes of branches are spared:
>>
>> * any branch checked out in any worktree;
>> * any branch whose upstream no longer resolves locally (its
>> disappearance is not, on its own, evidence of integration);
>> * any branch whose push destination equals its upstream
>> (<branch>@{push} == <branch>@{upstream}). Such a branch
>> cannot be distinguished from a freshly pulled trunk that
>> just looks "fully merged", e.g. local "main" tracking and
>> pushing to "origin/main" right after a pull. Only branches
>> that push somewhere other than their upstream (typically
>> topics in a fork-based workflow) are treated as candidates.
>>
>> Deletion goes through the existing delete_branches() in warn-only
>> mode and with the HEAD-fallback disabled: a branch that is not
>> yet fully merged to its upstream is reported as a one-line warning
>> and skipped, so a single un-mergeable topic does not abort the
>> whole sweep. We only act on upstream-merged status.
>>
>> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
>> ---
>> Documentation/git-branch.adoc | 23 +++++
>> builtin/branch.c | 117 +++++++++++++++++++--
>> t/t3200-branch.sh | 188 ++++++++++++++++++++++++++++++++++
>> 3 files changed, 318 insertions(+), 10 deletions(-)
>>
>> diff --git a/Documentation/git-branch.adoc b/Documentation/git-
>> branch.adoc
>> index 8002d7f38c..f7942fcd7d 100644
>> --- a/Documentation/git-branch.adoc
>> +++ b/Documentation/git-branch.adoc
>> @@ -25,6 +25,7 @@ git branch (-m|-M) [<old-branch>] <new-branch>
>> git branch (-c|-C) [<old-branch>] <new-branch>
>> git branch (-d|-D) [-r] <branch-name>...
>> git branch --edit-description [<branch-name>]
>> +git branch (--prune-merged <branch>)...
>> DESCRIPTION
>> -----------
>> @@ -206,6 +207,28 @@ This option is only applicable in non-verbose mode.
>> `master`) or a shell-style glob (e.g. `'origin/*'`). The
>> option can be repeated to widen the filter.
>> +`--prune-merged <branch>`::
>> + Delete the local branches that `--forked` would list for the
>> + same _<branch>_, but only those whose tip is reachable from
>> + their configured upstream. In other words, the work on the
>> + branch has already landed on the upstream it tracks, so the
>> + local copy is no longer needed. May be given more than once to
>> + union the matches; positional arguments are not accepted.
>> ++
>> +Reachability is checked against whatever the upstream refs say
>> +locally; nothing is fetched. Run `git fetch` first if you want
>> +the upstream refs refreshed.
>> ++
>> +A branch is left alone if any of the following holds:
>> +its upstream no longer resolves locally; it is checked out in any
>> +worktree; or its push destination (`<branch>@{push}`) equals its
>> +upstream (`<branch>@{upstream}`), so it cannot be distinguished
>> +from a freshly pulled trunk that just looks "fully merged".
>> ++
>> +Branches refused by the "fully merged" safety check are listed as
>> +warnings and skipped; pass them to `git branch -D` explicitly if
>> +you want them gone.
>> +
>> `-v`::
>> `-vv`::
>> `--verbose`::
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index 09afdd9257..736480b002 100644
>> --- a/builtin/branch.c
>> +++ b/builtin/branch.c
>> @@ -39,6 +39,7 @@ static const char * const builtin_branch_usage[] = {
>> N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
>> N_("git branch [<options>] [-r | -a] [--points-at]"),
>> N_("git branch [<options>] [-r | -a] [--format]"),
>> + N_("git branch [<options>] (--prune-merged <branch>)..."),
>> NULL
>> };
>> @@ -782,17 +783,13 @@ static int upstream_matches(const char
>> *short_upstream,
>> return 0;
>> }
>> -static int branch_upstream_matches(const char *full_refname,
>> +static int branch_upstream_matches(const char *short_branch_name,
>> const struct upstream_pattern *patterns,
>> size_t nr_patterns)
>> {
>> - const char *short_name;
>> - struct branch *branch;
>> + struct branch *branch = branch_get(short_branch_name);
>> const char *upstream;
>> - if (!skip_prefix(full_refname, "refs/heads/", &short_name))
>> - return 0;
>> - branch = branch_get(short_name);
>> if (!branch)
>> return 0;
>> upstream = branch_get_upstream(branch, NULL);
>> @@ -813,8 +810,9 @@ static void filter_array_by_forked(struct
>> ref_array *array,
>> for (i = 0; i < array->nr; i++) {
>> struct ref_array_item *item = array->items[i];
>> - if (branch_upstream_matches(item->refname,
>> - patterns, nr_patterns))
>> + const char *short_name;
>> + if (skip_prefix(item->refname, "refs/heads/", &short_name) &&
>> + branch_upstream_matches(short_name, patterns, nr_patterns))
>> array->items[kept++] = item;
>> else
>> free_ref_array_item(item);
>> @@ -824,6 +822,94 @@ static void filter_array_by_forked(struct
>> ref_array *array,
>> upstream_pattern_list_clear(patterns, nr_patterns);
>> }
>> +struct forked_cb {
>> + const struct upstream_pattern *patterns;
>> + size_t nr_patterns;
>> + struct string_list *out;
>> +};
>> +
>> +static int collect_forked_branch(const struct reference *ref, void
>> *cb_data)
>> +{
>> + struct forked_cb *cb = cb_data;
>> +
>> + if (ref->flags & REF_ISSYMREF)
>> + return 0;
>> + if (branch_upstream_matches(ref->name, cb->patterns, cb-
>> >nr_patterns))
>> + string_list_append(cb->out, ref->name);
>> + return 0;
>> +}
>> +
>> +static void collect_forked_set(const struct string_list *upstreams,
>> + struct string_list *out)
>> +{
>> + struct upstream_pattern *patterns = NULL;
>> + size_t nr_patterns = 0;
>> + struct forked_cb cb;
>> +
>> + parse_forked_args(upstreams, &patterns, &nr_patterns);
>> + cb.patterns = patterns;
>> + cb.nr_patterns = nr_patterns;
>> + cb.out = out;
>> +
>> + refs_for_each_branch_ref(get_main_ref_store(the_repository),
>> + collect_forked_branch, &cb);
>> +
>> + string_list_sort(out);
>> +
>> + upstream_pattern_list_clear(patterns, nr_patterns);
>> +}
>> +
>> +static int prune_merged_branches(const struct string_list *upstreams,
>> + int quiet)
>> +{
>> + struct ref_store *refs = get_main_ref_store(the_repository);
>> + struct string_list candidates = STRING_LIST_INIT_DUP;
>> + struct strvec deletable = STRVEC_INIT;
>> + struct string_list_item *item;
>> + int ret = 0;
>> +
>> + if (!upstreams->nr)
>> + die(_("--prune-merged requires at least one <branch>"));
>> +
>> + collect_forked_set(upstreams, &candidates);
>> +
>> + for_each_string_list_item(item, &candidates) {
>> + const char *short_name = item->string;
>> + struct branch *branch = branch_get(short_name);
>> + const char *upstream, *push;
>> + struct strbuf full = STRBUF_INIT;
>> + int skip;
>> +
>> + strbuf_addf(&full, "refs/heads/%s", short_name);
>> + skip = !!branch_checked_out(full.buf);
>> + strbuf_release(&full);
>> + if (skip)
>> + continue;
>> +
>> + upstream = branch ? branch_get_upstream(branch, NULL) : NULL;
>> + if (!upstream || !refs_ref_exists(refs, upstream))
>> + continue;
>> + push = branch ? branch_get_push(branch, NULL) : NULL;
>> + if (!push || !strcmp(push, upstream))
>> + continue;
>> +
>> + strvec_push(&deletable, short_name);
>> + }
>> +
>> + if (deletable.nr)
>> + ret = delete_branches(deletable.nr, deletable.v,
>> + 0, /* force */
>> + FILTER_REFS_BRANCHES,
>> + quiet,
>> + 1, /* warn_only */
>> + 1, /* no_head_fallback */
>> + 0 /* dry_run */);
>> +
>> + strvec_clear(&deletable);
>> + string_list_clear(&candidates, 0);
>> + return ret;
>> +}
>> +
>> static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
>> static int edit_branch_description(const char *branch_name)
>> @@ -866,6 +952,7 @@ int cmd_branch(int argc,
>> int delete = 0, rename = 0, copy = 0, list = 0,
>> unset_upstream = 0, show_current = 0, edit_description = 0;
>> struct string_list forked_upstreams = STRING_LIST_INIT_DUP;
>> + struct string_list prune_merged_upstreams = STRING_LIST_INIT_DUP;
>> const char *new_upstream = NULL;
>> int noncreate_actions = 0;
>> /* possible options */
>> @@ -921,6 +1008,8 @@ int cmd_branch(int argc,
>> N_("edit the description for the branch")),
>> OPT_STRING_LIST(0, "forked", &forked_upstreams, N_("branch"),
>> N_("list local branches whose upstream matches <branch>
>> (repeatable)")),
>> + OPT_STRING_LIST(0, "prune-merged", &prune_merged_upstreams,
>> N_("branch"),
>> + N_("delete local branches whose upstream matches <branch>
>> and is merged (repeatable)")),
>> OPT__FORCE(&force, N_("force creation, move/rename,
>> deletion"), PARSE_OPT_NOCOMPLETE),
>> OPT_MERGED(&filter, N_("print only branches that are merged")),
>> OPT_NO_MERGED(&filter, N_("print only branches that are not
>> merged")),
>> @@ -965,7 +1054,8 @@ int cmd_branch(int argc,
>> 0);
>> if (!delete && !rename && !copy && !edit_description && !
>> new_upstream &&
>> - !show_current && !unset_upstream && argc == 0)
>> + !show_current && !unset_upstream && !
>> prune_merged_upstreams.nr &&
>> + argc == 0)
>> list = 1;
>> if (filter.with_commit || filter.no_commit ||
>> @@ -975,7 +1065,7 @@ int cmd_branch(int argc,
>> noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
>> !!show_current + !!list + !!edit_description +
>> - !!unset_upstream;
>> + !!unset_upstream + !!prune_merged_upstreams.nr;
>> if (noncreate_actions > 1)
>> usage_with_options(builtin_branch_usage, options);
>> @@ -1016,6 +1106,12 @@ int cmd_branch(int argc,
>> ret = delete_branches(argc, argv, delete > 1, filter.kind,
>> quiet, 0, 0, 0);
>> goto out;
>> + } else if (prune_merged_upstreams.nr) {
>> + if (argc)
>> + die(_("--prune-merged does not take positional arguments; "
>> + "repeat --prune-merged for each <branch>"));
>> + ret = prune_merged_branches(&prune_merged_upstreams, quiet);
>> + goto out;
>> } else if (show_current) {
>> print_current_branch_name();
>> ret = 0;
>> @@ -1178,5 +1274,6 @@ int cmd_branch(int argc,
>> out:
>> string_list_clear(&sorting_options, 0);
>> string_list_clear(&forked_upstreams, 0);
>> + string_list_clear(&prune_merged_upstreams, 0);
>> return ret;
>> }
>> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
>> index 4e7deddc04..beb86987ad 100755
>> --- a/t/t3200-branch.sh
>> +++ b/t/t3200-branch.sh
>> @@ -1809,4 +1809,192 @@ test_expect_success '--forked requires a value' '
>> test_grep "requires a value" err
>> '
>> +test_expect_success '--prune-merged: setup' '
>> + test_create_repo pm-upstream &&
>> + test_commit -C pm-upstream base &&
>> + git -C pm-upstream checkout -b next &&
>> + test_commit -C pm-upstream one-commit &&
>> + test_commit -C pm-upstream two-commit &&
>> + git -C pm-upstream branch one HEAD~ &&
>> + git -C pm-upstream branch two HEAD &&
>> + git -C pm-upstream branch wip main &&
>> + git -C pm-upstream checkout main &&
>> + test_create_repo pm-fork
>> +'
>> +
>> +test_expect_success '--prune-merged deletes branches integrated into
>> upstream' '
>> + test_when_finished "rm -rf pm-merged" &&
>> + git clone pm-upstream pm-merged &&
>> + git -C pm-merged remote add fork ../pm-fork &&
>> + test_config -C pm-merged remote.pushDefault fork &&
>> + test_config -C pm-merged push.default current &&
>> + git -C pm-merged branch one one-commit &&
>> + git -C pm-merged branch --set-upstream-to=origin/next one &&
>> + git -C pm-merged branch two two-commit &&
>> + git -C pm-merged branch --set-upstream-to=origin/next two &&
>> +
>> + git -C pm-merged branch --prune-merged "origin/*" &&
>> +
>> + test_must_fail git -C pm-merged rev-parse --verify refs/heads/one &&
>> + test_must_fail git -C pm-merged rev-parse --verify refs/heads/two
>> +'
>> +
>> +test_expect_success '--prune-merged accepts a literal upstream' '
>> + test_when_finished "rm -rf pm-literal" &&
>> + git clone pm-upstream pm-literal &&
>> + git -C pm-literal remote add fork ../pm-fork &&
>> + test_config -C pm-literal remote.pushDefault fork &&
>> + test_config -C pm-literal push.default current &&
>> + git -C pm-literal branch one one-commit &&
>> + git -C pm-literal branch --set-upstream-to=origin/next one &&
>> +
>> + git -C pm-literal branch --prune-merged origin/next &&
>> +
>> + test_must_fail git -C pm-literal rev-parse --verify refs/heads/one
>> +'
>> +
>> +test_expect_success '--prune-merged unions multiple <branch>
>> arguments' '
>> + test_when_finished "rm -rf pm-union" &&
>> + git clone pm-upstream pm-union &&
>> + git -C pm-union remote add fork ../pm-fork &&
>> + test_config -C pm-union remote.pushDefault fork &&
>> + test_config -C pm-union push.default current &&
>> + git -C pm-union branch one one-commit &&
>> + git -C pm-union branch --set-upstream-to=origin/next one &&
>> + git -C pm-union branch two base &&
>> + git -C pm-union branch --set-upstream-to=origin/main two &&
>> + git -C pm-union checkout --detach &&
>> +
>> + git -C pm-union branch --prune-merged origin/next --prune-merged
>> origin/main &&
>> +
>> + test_must_fail git -C pm-union rev-parse --verify refs/heads/one &&
>> + test_must_fail git -C pm-union rev-parse --verify refs/heads/two
>> +'
>> +
>> +test_expect_success '--prune-merged accepts a local upstream' '
>> + test_when_finished "rm -rf pm-local" &&
>> + git clone pm-upstream pm-local &&
>> + git -C pm-local remote add fork ../pm-fork &&
>> + test_config -C pm-local remote.pushDefault fork &&
>> + test_config -C pm-local push.default current &&
>> + git -C pm-local checkout -b trunk &&
>> + git -C pm-local branch one one-commit &&
>> + git -C pm-local branch --set-upstream-to=trunk one &&
>> + git -C pm-local merge --ff-only one-commit &&
>> +
>> + git -C pm-local branch --prune-merged trunk &&
>> +
>> + test_must_fail git -C pm-local rev-parse --verify refs/heads/one
>> +'
>> +
>> +test_expect_success '--prune-merged warns instead of erroring on un-
>> integrated commits' '
>> + test_when_finished "rm -rf pm-unmerged" &&
>> + git clone pm-upstream pm-unmerged &&
>> + git -C pm-unmerged remote add fork ../pm-fork &&
>> + test_config -C pm-unmerged remote.pushDefault fork &&
>> + test_config -C pm-unmerged push.default current &&
>> + git -C pm-unmerged checkout -b wip origin/wip &&
>> + git -C pm-unmerged branch --set-upstream-to=origin/next wip &&
>> + test_commit -C pm-unmerged local-only &&
>> + git -C pm-unmerged checkout - &&
>> +
>> + git -C pm-unmerged branch --prune-merged "origin/*" 2>err &&
>> + test_grep "not fully merged" err &&
>> + test_grep ! "If you are sure you want to delete it" err &&
>> + git -C pm-unmerged rev-parse --verify refs/heads/wip
>> +'
>> +
>> +test_expect_success '--prune-merged is silent about not-merged-to-
>> HEAD' '
>> + test_when_finished "rm -rf pm-nohead" &&
>> + git clone pm-upstream pm-nohead &&
>> + git -C pm-nohead remote add fork ../pm-fork &&
>> + test_config -C pm-nohead remote.pushDefault fork &&
>> + test_config -C pm-nohead push.default current &&
>> + git -C pm-nohead branch topic one-commit &&
>> + git -C pm-nohead branch --set-upstream-to=origin/next topic &&
>> +
>> + git -C pm-nohead branch --prune-merged "origin/*" 2>err &&
>> +
>> + test_grep ! "not yet merged to HEAD" err &&
>> + test_must_fail git -C pm-nohead rev-parse --verify refs/heads/topic
>> +'
>> +
>> +test_expect_success '--prune-merged skips branches whose upstream is
>> gone' '
>> + test_when_finished "rm -rf pm-upstream-gone" &&
>> + git clone pm-upstream pm-upstream-gone &&
>> + git -C pm-upstream-gone remote add fork ../pm-fork &&
>> + test_config -C pm-upstream-gone remote.pushDefault fork &&
>> + test_config -C pm-upstream-gone push.default current &&
>> + git -C pm-upstream-gone branch one one-commit &&
>> + git -C pm-upstream-gone branch --set-upstream-to=origin/next one &&
>> +
>> + git -C pm-upstream-gone update-ref -d refs/remotes/origin/next &&
>> + git -C pm-upstream-gone branch --prune-merged "origin/*" &&
>> +
>> + git -C pm-upstream-gone rev-parse --verify refs/heads/one
>> +'
>> +
>> +test_expect_success '--prune-merged never deletes the checked-out
>> branch' '
>> + test_when_finished "rm -rf pm-head" &&
>> + git clone pm-upstream pm-head &&
>> + git -C pm-head remote add fork ../pm-fork &&
>> + test_config -C pm-head remote.pushDefault fork &&
>> + test_config -C pm-head push.default current &&
>> + git -C pm-head checkout -b one one-commit &&
>> + git -C pm-head branch --set-upstream-to=origin/next one &&
>> +
>> + git -C pm-head branch --prune-merged "origin/*" &&
>> +
>> + git -C pm-head rev-parse --verify refs/heads/one
>> +'
>> +
>> +test_expect_success '--prune-merged spares branches that push back to
>> their upstream' '
>> + test_when_finished "rm -rf pm-push-eq" &&
>> + git clone pm-upstream pm-push-eq &&
>> + git -C pm-push-eq checkout --detach &&
>> +
>> + git -C pm-push-eq branch --prune-merged "origin/*" &&
>> +
>> + git -C pm-push-eq rev-parse --verify refs/heads/main
>> +'
>> +
>> +test_expect_success '--prune-merged spares a per-branch
>> pushRemote==upstream remote' '
>> + test_when_finished "rm -rf pm-push-branch" &&
>> + git clone pm-upstream pm-push-branch &&
>> + git -C pm-push-branch remote add fork ../pm-fork &&
>> + test_config -C pm-push-branch remote.pushDefault fork &&
>> + test_config -C pm-push-branch push.default current &&
>> + test_config -C pm-push-branch branch.main.pushRemote origin &&
>> + git -C pm-push-branch checkout --detach &&
>> +
>> + git -C pm-push-branch branch --prune-merged "origin/*" &&
>> +
>> + git -C pm-push-branch rev-parse --verify refs/heads/main
>> +'
>> +
>> +test_expect_success '--prune-merged prunes when @{push} differs from
>> @{upstream}' '
>> + test_when_finished "rm -rf pm-push-diff" &&
>> + git clone pm-upstream pm-push-diff &&
>> + git -C pm-push-diff remote add fork ../pm-fork &&
>> + test_config -C pm-push-diff remote.pushDefault fork &&
>> + test_config -C pm-push-diff push.default current &&
>> + git -C pm-push-diff branch topic one-commit &&
>> + git -C pm-push-diff branch --set-upstream-to=origin/next topic &&
>> + git -C pm-push-diff checkout --detach &&
>> +
>> + git -C pm-push-diff branch --prune-merged "origin/*" &&
>> +
>> + test_must_fail git -C pm-push-diff rev-parse --verify refs/heads/
>> topic
>> +'
>> +
>> +test_expect_success '--prune-merged requires a value' '
>> + test_must_fail git -C forked branch --prune-merged 2>err &&
>> + test_grep "requires a value" err
>> +'
>> +
>> +test_expect_success '--prune-merged rejects positional arguments' '
>> + test_must_fail git -C forked branch --prune-merged origin/one
>> other/foreign 2>err &&
>> + test_grep "does not take positional arguments" err
>> +'
>> +
>> test_done
>
^ permalink raw reply
* Re: [PATCH 01/16] packfile: rename `struct packfile_store` to `odb_source_packed`
From: Karthik Nayak @ 2026-06-05 14:25 UTC (permalink / raw)
To: Patrick Steinhardt, git
In-Reply-To: <20260604-pks-odb-source-packed-v1-1-2e7ab31b4b5c@pks.im>
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
Patrick Steinhardt <ps@pks.im> writes:
> Not too long ago, we have introduced the packfile store in b7983adb51
> (packfile: introduce a new `struct packfile_store`, 2025-09-23). This
> struct is responsible for managing all of our access to packfiles and is
> used as one of the two sources of objects for the "files" source.
>
> Back when I introduced this structure I didn't have the clear vision yet
> that it will eventually also turn into a proper object database source,
> and how exactly that infrastructure will look like. Now though it's
> becoming increasingly clear that it does make sense to treat it just the
> same as any of our other ODB sources.
>
> The consequence is that the naming is now a bit out-of-date: it's just
> another source and will be turned into a proper `struct odb_source` over
> the next couple of commits, but it's not named accordingly.
>
> Rename the structure to `odb_source_packed` to align it with this goal
> and to bring it in line with the other sources we already have.
>
Looks good, I'm assuming we'll also rename drop some of the
`packfile_store_*` functions as things get cleaned up in the following
commits.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 690 bytes --]
^ permalink raw reply
* Re: [PATCH v3 0/8] setup: centralize object database creation
From: Karthik Nayak @ 2026-06-05 14:16 UTC (permalink / raw)
To: Patrick Steinhardt, git; +Cc: Kristoffer Haugsbakk, Junio C Hamano
In-Reply-To: <20260604-b4-pks-setup-centralize-odb-creation-v3-0-0691834f318a@pks.im>
[-- Attachment #1: Type: text/plain, Size: 4824 bytes --]
Patrick Steinhardt <ps@pks.im> writes:
> Hi,
>
> this small patch series refactors the logic for how we discover and
> configure repositories. Most importantly, this involves the following
> two steps:
>
> 1. We unify the logic to apply the repository format, which is
> currently open-coded across multiple sites. These sites have
> already diverged, where some repository extensions are not
> consistently applied.
>
> 2. We then centralize creation of the object database to happen at the
> same time we apply the repository format.
>
> The end result is that we apply the repository format exactly once, and
> that's also the point in time where we can finalize the setup of the
> repo's data structures as we know about all details of the repo at that
> time. Ultimately, this makes it trivial to introduce the "objectStorage"
> extension, even though that's not part of this patch series.
>
> The series is built on top of aec3f58750 (Sync with 'maint', 2026-05-21)
> with ps/setup-wo-the-repository at df69f40c34 (setup: stop using
> `the_repository` in `init_db()`, 2026-05-19) merged into it.
>
> Changes in v3:
> - Explain the move of `verify_repository_format()` better.
> - Document that `apply_repository_format()` also verifies the format.
> - Link to v2: https://patch.msgid.link/20260526-b4-pks-setup-centralize-odb-creation-v2-0-2fa5b385c13e@pks.im
>
> Changes in v2:
> - Commit message improvements.
> - Link to v1: https://patch.msgid.link/20260521-b4-pks-setup-centralize-odb-creation-v1-0-f130d2a7e8ae@pks.im
>
> Thanks!
>
> Patrick
>
> ---
> Patrick Steinhardt (8):
> t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORY
> setup: drop `setup_git_env()`
> setup: deduplicate logic to apply repository format
> repository: stop initializing the object database in `repo_set_gitdir()`
> setup: stop creating the object database in `setup_git_env()`
> setup: stop initializing object database without repository
> repository: stop reading loose object map twice on repo init
> setup: construct object database in `apply_repository_format()`
>
> commit-graph.c | 4 +-
> environment.h | 8 +---
> refs.c | 3 +-
> repository.c | 40 +++++------------
> repository.h | 3 --
> setup.c | 130 +++++++++++++++++++++++++++++++-------------------------
> setup.h | 20 +++++++++
> t/t0001-init.sh | 10 +++++
> 8 files changed, 118 insertions(+), 100 deletions(-)
>
> Range-diff versus v2:
>
> 1: 50224c1a12 = 1: a6f452b947 t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORY
> 2: 6d655e00e3 = 2: 905e618dc6 setup: drop `setup_git_env()`
> 3: 2e7e9bb052 ! 3: e11f16333d setup: deduplicate logic to apply repository format
> @@ Commit message
>
> Introduce a new function `apply_repository_format()` that takes a repo
> and applies a given format to it and adapt all callsites to use it.
> - While at it, rename `check_repository_format()` to clarify that it
> - doesn't only _check_ the format, but that it also applies it.
> + This function is also the new caller of `verify_repository_format()` so
> + that we can ensure that we never apply an invalid repository format.
> + The verification we have in `read_and_verify_repository_format()` is
> + thus redundant now and dropped.
> +
> + Rename `read_and_verify_repository_format()` accordingly. While at it,
> + also rename `check_repository_format()` to clarify that it doesn't only
> + _check_ the format, but that it also applies it.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
>
> @@ setup.h: void clear_repository_format(struct repository_format *format);
> +/*
> + * Apply the given repository format to the repo. This initializes extensions
> + * and basic data structures required for normal operation. Returns 0 on
> -+ * success, a negative error code otherwise.
> ++ * success, a negative error code when the format is not valid as determined by
> ++ * `verify_repository_format()`.
> + */
> +int apply_repository_format(struct repository *repo,
> + const struct repository_format *format,
> 4: 81b92bca7f = 4: b0d7c11fe6 repository: stop initializing the object database in `repo_set_gitdir()`
> 5: 807fc56353 = 5: d0af56fdae setup: stop creating the object database in `setup_git_env()`
> 6: 96563ff99f = 6: 3e75c5b0a6 setup: stop initializing object database without repository
> 7: c14f45169c = 7: 50fa2fdb3c repository: stop reading loose object map twice on repo init
> 8: e67c6e66d6 = 8: 4dff9d1794 setup: construct object database in `apply_repository_format()`
>
The range-diff looks good and as expected. Thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 690 bytes --]
^ permalink raw reply
* [PATCH v3 4/4] doc: replay: move “default” to the right-hand side
From: kristofferhaugsbakk @ 2026-06-05 13:56 UTC (permalink / raw)
To: Junio C Hamano
Cc: Kristoffer Haugsbakk, Siddharth Asthana, git, Patrick Steinhardt
In-Reply-To: <V3_CV_doc_replay_config.780@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
This is now a description list (see previous commit) and parentheticals
like this do not go on the left-hand side. Moving it to the other side
makes it stand out just as much and is also more consistent with the
rest of the documentation.
Let’s also do the same for the `replay.refAction` description list.
That makes the two desc. lists identical in the first sentence. Let’s
add a comment about that for future editors.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v2:
• It’s “description list”, not “definition list”
• (Same mistake I have done for “line continuation” (it’s “list”))
• It’s e.g. “right-hand side” (drop “-side” hyphen)
• Change `replay.refAction` “default” placement
• Now that these two description lists are so similar, add an
AsciiDoc comment about it for future editors. Note that I
outright deleted this list in the previous version because I
didn’t want to keep them in synch. But we can remain aware of
these with two comments.
---
v1:
> do not go on the left-hand-side.
At least I haven’t seen it.
Documentation/config/replay.adoc | 5 ++++-
Documentation/git-replay.adoc | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/replay.adoc b/Documentation/config/replay.adoc
index 7328da9537d..40d1695782a 100644
--- a/Documentation/config/replay.adoc
+++ b/Documentation/config/replay.adoc
@@ -3,7 +3,10 @@ replay.refAction::
The value can be:
+
--
-`update`;; Update refs directly using an atomic transaction (default behavior).
+////
+These use the first sentences from the description list in git-replay(1).
+////
+`update`;; (default) Update refs directly using an atomic transaction.
`print`;; Output update-ref commands for pipeline use.
--
+
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index b4fe43ec687..ea4d14baddb 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -80,7 +80,10 @@ incompatible with `--contained` (which is a modifier for `--onto` only).
Control how references are updated. The mode can be:
+
--
-`update` (default);; Update refs directly using an atomic transaction.
+////
+Expanded description list compared to 'replay.refAction'.
+////
+`update`;; (default) Update refs directly using an atomic transaction.
All refs are updated or none are (all-or-nothing behavior).
`print`;; Output update-ref commands for pipeline use. This is the
traditional behavior where output can be piped to `git update-ref --stdin`.
--
2.54.0.22.g9e26862b904
^ permalink raw reply related
* [PATCH v3 3/4] doc: replay: use a nested description list
From: kristofferhaugsbakk @ 2026-06-05 13:56 UTC (permalink / raw)
To: Junio C Hamano
Cc: Kristoffer Haugsbakk, Siddharth Asthana, git, Patrick Steinhardt
In-Reply-To: <V3_CV_doc_replay_config.780@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
This bullet list for `--ref-action` introduces a term with a colon.
This is exactly what a description list is, structurally. Let’s be
stylistically consistent and use the desc. list markup construct.
In short, just transform this unordered list in the same way that we
did for `replay.refAction` in the previous commit.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v3:
• Msg:[1] Fix typo: “stylistically”
• Msg: Simplify message. Devote one paragraph to † 1: Commit
explain the transformation. Then delegate to the message
previous patch since we did the same trans-
formation there.
---
v2:
• Msg: Mention that the explanation for the description list is the
same as in the previous commit
• Msg: It’s “description list”, not “definition list”
Documentation/git-replay.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index 4de85088d6c..b4fe43ec687 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -80,10 +80,10 @@ incompatible with `--contained` (which is a modifier for `--onto` only).
Control how references are updated. The mode can be:
+
--
- * `update` (default): Update refs directly using an atomic transaction.
- All refs are updated or none are (all-or-nothing behavior).
- * `print`: Output update-ref commands for pipeline use. This is the
- traditional behavior where output can be piped to `git update-ref --stdin`.
+`update` (default);; Update refs directly using an atomic transaction.
+ All refs are updated or none are (all-or-nothing behavior).
+`print`;; Output update-ref commands for pipeline use. This is the
+ traditional behavior where output can be piped to `git update-ref --stdin`.
--
+
The default mode can be configured via the `replay.refAction` configuration variable.
--
2.54.0.22.g9e26862b904
^ permalink raw reply related
* [PATCH v3 2/4] doc: replay: improve config description
From: kristofferhaugsbakk @ 2026-06-05 13:56 UTC (permalink / raw)
To: Junio C Hamano
Cc: Kristoffer Haugsbakk, Siddharth Asthana, git, Patrick Steinhardt
In-Reply-To: <V3_CV_doc_replay_config.780@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
First of all, this unordered list for `replay.refAction` introduces
a term with a colon. This is exactly what a description list is,
structurally. Let’s be stylistically consistent and use the desc.
list markup construct. Let’s also drop the harmless but unneeded
indentation.
We can reuse the `::` delimiter since we use an open block.
But for consistency use the typical nested description list
delimiter, namely `;;`.
Second, let’s replace the inline-verbatim `git replay` with a link
to git-replay(1), since we are naming the command. But make that
conditional so that we avoid a self-link inside git-replay(1).[1]
† 1: See e.g. e7b3a768 (doc: git-init: rework config item
init.templateDir, 2024-03-10) for another example of
avoiding self-linking
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v3:
• Msg:[1] typo, fix to “stylistically”
• Msg: Move the paragraph about delimiters (;;) from the *next*
patch over here instead. This is the first place we do it. In the
next patch we can just say that we are doing the same trans-
formation as here.
• Msg: Remove double-space to separate two sentences. That’s
inconsitent for me. I moved away from that because two-space
separation takes up too much space when linewrapping is set to 72.
• Msg: This isn’t the option, it is `replay.refAction`
• Copy–paste mistake? We don’t have to ask
• Msg: ... and it’s better to call it an unordered list rather than
bullet points
† 1: Commit message
---
v2:
• Keep the description list for `replay.refAction` (Junio)
• Now rewrite the description list like in patch 1/3 (it’s
technically an unordered list)
• Msg: mention a previous commit which also avoided self-linking.
This helps establish a bit more context for why we do this.
Documentation/config/replay.adoc | 16 ++++++++++------
Documentation/git-replay.adoc | 1 +
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Documentation/config/replay.adoc b/Documentation/config/replay.adoc
index 7d549d2f0e5..7328da9537d 100644
--- a/Documentation/config/replay.adoc
+++ b/Documentation/config/replay.adoc
@@ -1,11 +1,15 @@
replay.refAction::
- Specifies the default mode for handling reference updates in
- `git replay`. The value can be:
+ Specifies the default mode for handling reference updates.
+ The value can be:
+
--
- * `update`: Update refs directly using an atomic transaction (default behavior).
- * `print`: Output update-ref commands for pipeline use.
+`update`;; Update refs directly using an atomic transaction (default behavior).
+`print`;; Output update-ref commands for pipeline use.
--
+
-This setting can be overridden with the `--ref-action` command-line option.
-When not configured, `git replay` defaults to `update` mode.
+ifdef::git-replay[]
+See `--ref-action`.
+endif::git-replay[]
+ifndef::git-replay[]
+See `--ref-action` for linkgit:git-replay[1] for details.
+endif::git-replay[]
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index f9ca2db2833..4de85088d6c 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -211,6 +211,7 @@ to use bare commit IDs instead of branch names.
CONFIGURATION
-------------
+:git-replay: 1
include::config/replay.adoc[]
GIT
--
2.54.0.22.g9e26862b904
^ permalink raw reply related
* [PATCH v3 1/4] doc: link to config for git-replay(1)
From: kristofferhaugsbakk @ 2026-06-05 13:55 UTC (permalink / raw)
To: Junio C Hamano
Cc: Kristoffer Haugsbakk, Siddharth Asthana, git, Patrick Steinhardt
In-Reply-To: <V3_CV_doc_replay_config.780@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
This config doc was added in 336ac90c (replay: add replay.refAction
config option, 2025-11-06) but never included anywhere. Include it in
git-replay(1) and git-config(1).
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Documentation/config.adoc | 2 ++
Documentation/git-replay.adoc | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index 62eebe7c545..51fabecb9b0 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -511,6 +511,8 @@ include::config/remotes.adoc[]
include::config/repack.adoc[]
+include::config/replay.adoc[]
+
include::config/rerere.adoc[]
include::config/revert.adoc[]
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index a32f72aead3..f9ca2db2833 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -209,6 +209,10 @@ This replays the range `aabbcc..ddeeff` onto commit `112233` and updates
`refs/heads/mybranch` to point at the result. This can be useful when you want
to use bare commit IDs instead of branch names.
+CONFIGURATION
+-------------
+include::config/replay.adoc[]
+
GIT
---
Part of the linkgit:git[1] suite
--
2.54.0.22.g9e26862b904
^ permalink raw reply related
* [PATCH v3 0/4] doc: replay: fix config link
From: kristofferhaugsbakk @ 2026-06-05 13:55 UTC (permalink / raw)
To: Junio C Hamano
Cc: Kristoffer Haugsbakk, Siddharth Asthana, git, Patrick Steinhardt
In-Reply-To: <V2_CV_doc_replay_config.767@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Topic name (applied): kh/doc-replay-config
Topic summary: link to the config for git-replay(1) (one variable) in
git-replay(1) and git-config(1). Also improve the doc for that config
variable and `--ref-action`.
§ Changes in v3
Fix a commit message typo to “stylistically”. Also improve (IMO) the commit
messages a bit. See the notes on the patches for details.
§ Link to v2
https://lore.kernel.org/git/V2_CV_doc_replay_config.767@msgid.xyz/
[1/4] doc: link to config for git-replay(1)
[2/4] doc: replay: improve config description
[3/4] doc: replay: use a nested description list
[4/4] doc: replay: move “default” to the right-hand side
Documentation/config.adoc | 2 ++
Documentation/config/replay.adoc | 19 +++++++++++++------
Documentation/git-replay.adoc | 16 ++++++++++++----
3 files changed, 27 insertions(+), 10 deletions(-)
Interdiff against v2:
Range-diff against v2:
1: ef8212a076a = 1: ef8212a076a doc: link to config for git-replay(1)
2: b60e2e02826 ! 2: 35b44b922e5 doc: replay: improve config description
@@ Metadata
## Commit message ##
doc: replay: improve config description
- First of all, this bullet list for `--ref-action` introduces a term with
- a colon. This is exactly what a description list is, structurally. Let’s
- be sylistically consistent and use the description list markup
- construct. Let’s also drop the harmless but unneeded indentation.
+ First of all, this unordered list for `replay.refAction` introduces
+ a term with a colon. This is exactly what a description list is,
+ structurally. Let’s be stylistically consistent and use the desc.
+ list markup construct. Let’s also drop the harmless but unneeded
+ indentation.
+
+ We can reuse the `::` delimiter since we use an open block.
+ But for consistency use the typical nested description list
+ delimiter, namely `;;`.
Second, let’s replace the inline-verbatim `git replay` with a link
to git-replay(1), since we are naming the command. But make that
3: d13cd39cb36 ! 3: 12c73641fb9 doc: replay: use a nested description list
@@ Commit message
This bullet list for `--ref-action` introduces a term with a colon.
This is exactly what a description list is, structurally. Let’s be
- sylistically consistent and use the desc. list markup construct.[1]
+ stylistically consistent and use the desc. list markup construct.
- We can reuse the `::` delimiter since we use an open block.
- But for consistency use the typical nested description list
- delimiter, namely `;;`.
-
- Also drop the harmless but unneeded indentation.
-
- † 1: Same explanation as in the previous commit
+ In short, just transform this unordered list in the same way that we
+ did for `replay.refAction` in the previous commit.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
4: 17804ea7afa = 4: e2191c723fc doc: replay: move “default” to the right-hand side
base-commit: a89346e34a937f001e5d397ee62224e3e9852040
--
2.54.0.22.g9e26862b904
^ permalink raw reply
* Re: [PATCH v12 4/6] branch: add --prune-merged <branch>
From: Phillip Wood @ 2026-06-05 13:50 UTC (permalink / raw)
To: Harald Nordgren via GitGitGadget, git
Cc: Kristoffer Haugsbakk, Johannes Sixt, Harald Nordgren
In-Reply-To: <cccfdb831cc8c4ca0844d5b4ba2b70f0c801fc59.1780477479.git.gitgitgadget@gmail.com>
Hi Harald
On 03/06/2026 10:04, Harald Nordgren via GitGitGadget wrote:
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> git branch --prune-merged <branch>...
I'm not sure that synopsis is correct anymore as you need to repeat
"--prune-merged". As --prune-merged now takes an argument there is no
reason to forbid positional arguments so I think we should support
git branch --prune-merged origin/master 'feature*'
to delete all the branches beginning with "feature" that have the
upstream "origin/master" and have been merged.
I wonder about the name - the other options that delete branches are
called "delete", not "prune". Also "--prune-merged" does not delete the
branches listed by "--merged" so maybe "--delete-forked" would be better?
I've not commented in detail on the code as it will need to change a bit
once we match on full refnames and do the filtering in
apply_ref_filter() but I think the basics are sound.
I'll stop here - I did quickly scan the next two patches and they both
looked like sensible ideas.
Thanks
Phillip
> deletes the local branches that "--forked <branch>" would list,
> restricted to those whose tip is reachable from their configured
> upstream: the work has already landed on the upstream they track,
> so the local copy is no longer needed.
>
> Reachability is read from local refs; nothing is fetched. Users
> who want fresh upstream refs run "git fetch" first.
>
> Three classes of branches are spared:
>
> * any branch checked out in any worktree;
> * any branch whose upstream no longer resolves locally (its
> disappearance is not, on its own, evidence of integration);
> * any branch whose push destination equals its upstream
> (<branch>@{push} == <branch>@{upstream}). Such a branch
> cannot be distinguished from a freshly pulled trunk that
> just looks "fully merged", e.g. local "main" tracking and
> pushing to "origin/main" right after a pull. Only branches
> that push somewhere other than their upstream (typically
> topics in a fork-based workflow) are treated as candidates.
>
> Deletion goes through the existing delete_branches() in warn-only
> mode and with the HEAD-fallback disabled: a branch that is not
> yet fully merged to its upstream is reported as a one-line warning
> and skipped, so a single un-mergeable topic does not abort the
> whole sweep. We only act on upstream-merged status.
>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
> Documentation/git-branch.adoc | 23 +++++
> builtin/branch.c | 117 +++++++++++++++++++--
> t/t3200-branch.sh | 188 ++++++++++++++++++++++++++++++++++
> 3 files changed, 318 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc
> index 8002d7f38c..f7942fcd7d 100644
> --- a/Documentation/git-branch.adoc
> +++ b/Documentation/git-branch.adoc
> @@ -25,6 +25,7 @@ git branch (-m|-M) [<old-branch>] <new-branch>
> git branch (-c|-C) [<old-branch>] <new-branch>
> git branch (-d|-D) [-r] <branch-name>...
> git branch --edit-description [<branch-name>]
> +git branch (--prune-merged <branch>)...
>
> DESCRIPTION
> -----------
> @@ -206,6 +207,28 @@ This option is only applicable in non-verbose mode.
> `master`) or a shell-style glob (e.g. `'origin/*'`). The
> option can be repeated to widen the filter.
>
> +`--prune-merged <branch>`::
> + Delete the local branches that `--forked` would list for the
> + same _<branch>_, but only those whose tip is reachable from
> + their configured upstream. In other words, the work on the
> + branch has already landed on the upstream it tracks, so the
> + local copy is no longer needed. May be given more than once to
> + union the matches; positional arguments are not accepted.
> ++
> +Reachability is checked against whatever the upstream refs say
> +locally; nothing is fetched. Run `git fetch` first if you want
> +the upstream refs refreshed.
> ++
> +A branch is left alone if any of the following holds:
> +its upstream no longer resolves locally; it is checked out in any
> +worktree; or its push destination (`<branch>@{push}`) equals its
> +upstream (`<branch>@{upstream}`), so it cannot be distinguished
> +from a freshly pulled trunk that just looks "fully merged".
> ++
> +Branches refused by the "fully merged" safety check are listed as
> +warnings and skipped; pass them to `git branch -D` explicitly if
> +you want them gone.
> +
> `-v`::
> `-vv`::
> `--verbose`::
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 09afdd9257..736480b002 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -39,6 +39,7 @@ static const char * const builtin_branch_usage[] = {
> N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
> N_("git branch [<options>] [-r | -a] [--points-at]"),
> N_("git branch [<options>] [-r | -a] [--format]"),
> + N_("git branch [<options>] (--prune-merged <branch>)..."),
> NULL
> };
>
> @@ -782,17 +783,13 @@ static int upstream_matches(const char *short_upstream,
> return 0;
> }
>
> -static int branch_upstream_matches(const char *full_refname,
> +static int branch_upstream_matches(const char *short_branch_name,
> const struct upstream_pattern *patterns,
> size_t nr_patterns)
> {
> - const char *short_name;
> - struct branch *branch;
> + struct branch *branch = branch_get(short_branch_name);
> const char *upstream;
>
> - if (!skip_prefix(full_refname, "refs/heads/", &short_name))
> - return 0;
> - branch = branch_get(short_name);
> if (!branch)
> return 0;
> upstream = branch_get_upstream(branch, NULL);
> @@ -813,8 +810,9 @@ static void filter_array_by_forked(struct ref_array *array,
>
> for (i = 0; i < array->nr; i++) {
> struct ref_array_item *item = array->items[i];
> - if (branch_upstream_matches(item->refname,
> - patterns, nr_patterns))
> + const char *short_name;
> + if (skip_prefix(item->refname, "refs/heads/", &short_name) &&
> + branch_upstream_matches(short_name, patterns, nr_patterns))
> array->items[kept++] = item;
> else
> free_ref_array_item(item);
> @@ -824,6 +822,94 @@ static void filter_array_by_forked(struct ref_array *array,
> upstream_pattern_list_clear(patterns, nr_patterns);
> }
>
> +struct forked_cb {
> + const struct upstream_pattern *patterns;
> + size_t nr_patterns;
> + struct string_list *out;
> +};
> +
> +static int collect_forked_branch(const struct reference *ref, void *cb_data)
> +{
> + struct forked_cb *cb = cb_data;
> +
> + if (ref->flags & REF_ISSYMREF)
> + return 0;
> + if (branch_upstream_matches(ref->name, cb->patterns, cb->nr_patterns))
> + string_list_append(cb->out, ref->name);
> + return 0;
> +}
> +
> +static void collect_forked_set(const struct string_list *upstreams,
> + struct string_list *out)
> +{
> + struct upstream_pattern *patterns = NULL;
> + size_t nr_patterns = 0;
> + struct forked_cb cb;
> +
> + parse_forked_args(upstreams, &patterns, &nr_patterns);
> + cb.patterns = patterns;
> + cb.nr_patterns = nr_patterns;
> + cb.out = out;
> +
> + refs_for_each_branch_ref(get_main_ref_store(the_repository),
> + collect_forked_branch, &cb);
> +
> + string_list_sort(out);
> +
> + upstream_pattern_list_clear(patterns, nr_patterns);
> +}
> +
> +static int prune_merged_branches(const struct string_list *upstreams,
> + int quiet)
> +{
> + struct ref_store *refs = get_main_ref_store(the_repository);
> + struct string_list candidates = STRING_LIST_INIT_DUP;
> + struct strvec deletable = STRVEC_INIT;
> + struct string_list_item *item;
> + int ret = 0;
> +
> + if (!upstreams->nr)
> + die(_("--prune-merged requires at least one <branch>"));
> +
> + collect_forked_set(upstreams, &candidates);
> +
> + for_each_string_list_item(item, &candidates) {
> + const char *short_name = item->string;
> + struct branch *branch = branch_get(short_name);
> + const char *upstream, *push;
> + struct strbuf full = STRBUF_INIT;
> + int skip;
> +
> + strbuf_addf(&full, "refs/heads/%s", short_name);
> + skip = !!branch_checked_out(full.buf);
> + strbuf_release(&full);
> + if (skip)
> + continue;
> +
> + upstream = branch ? branch_get_upstream(branch, NULL) : NULL;
> + if (!upstream || !refs_ref_exists(refs, upstream))
> + continue;
> + push = branch ? branch_get_push(branch, NULL) : NULL;
> + if (!push || !strcmp(push, upstream))
> + continue;
> +
> + strvec_push(&deletable, short_name);
> + }
> +
> + if (deletable.nr)
> + ret = delete_branches(deletable.nr, deletable.v,
> + 0, /* force */
> + FILTER_REFS_BRANCHES,
> + quiet,
> + 1, /* warn_only */
> + 1, /* no_head_fallback */
> + 0 /* dry_run */);
> +
> + strvec_clear(&deletable);
> + string_list_clear(&candidates, 0);
> + return ret;
> +}
> +
> static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
>
> static int edit_branch_description(const char *branch_name)
> @@ -866,6 +952,7 @@ int cmd_branch(int argc,
> int delete = 0, rename = 0, copy = 0, list = 0,
> unset_upstream = 0, show_current = 0, edit_description = 0;
> struct string_list forked_upstreams = STRING_LIST_INIT_DUP;
> + struct string_list prune_merged_upstreams = STRING_LIST_INIT_DUP;
> const char *new_upstream = NULL;
> int noncreate_actions = 0;
> /* possible options */
> @@ -921,6 +1008,8 @@ int cmd_branch(int argc,
> N_("edit the description for the branch")),
> OPT_STRING_LIST(0, "forked", &forked_upstreams, N_("branch"),
> N_("list local branches whose upstream matches <branch> (repeatable)")),
> + OPT_STRING_LIST(0, "prune-merged", &prune_merged_upstreams, N_("branch"),
> + N_("delete local branches whose upstream matches <branch> and is merged (repeatable)")),
> OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE),
> OPT_MERGED(&filter, N_("print only branches that are merged")),
> OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
> @@ -965,7 +1054,8 @@ int cmd_branch(int argc,
> 0);
>
> if (!delete && !rename && !copy && !edit_description && !new_upstream &&
> - !show_current && !unset_upstream && argc == 0)
> + !show_current && !unset_upstream && !prune_merged_upstreams.nr &&
> + argc == 0)
> list = 1;
>
> if (filter.with_commit || filter.no_commit ||
> @@ -975,7 +1065,7 @@ int cmd_branch(int argc,
>
> noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
> !!show_current + !!list + !!edit_description +
> - !!unset_upstream;
> + !!unset_upstream + !!prune_merged_upstreams.nr;
> if (noncreate_actions > 1)
> usage_with_options(builtin_branch_usage, options);
>
> @@ -1016,6 +1106,12 @@ int cmd_branch(int argc,
> ret = delete_branches(argc, argv, delete > 1, filter.kind,
> quiet, 0, 0, 0);
> goto out;
> + } else if (prune_merged_upstreams.nr) {
> + if (argc)
> + die(_("--prune-merged does not take positional arguments; "
> + "repeat --prune-merged for each <branch>"));
> + ret = prune_merged_branches(&prune_merged_upstreams, quiet);
> + goto out;
> } else if (show_current) {
> print_current_branch_name();
> ret = 0;
> @@ -1178,5 +1274,6 @@ int cmd_branch(int argc,
> out:
> string_list_clear(&sorting_options, 0);
> string_list_clear(&forked_upstreams, 0);
> + string_list_clear(&prune_merged_upstreams, 0);
> return ret;
> }
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index 4e7deddc04..beb86987ad 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -1809,4 +1809,192 @@ test_expect_success '--forked requires a value' '
> test_grep "requires a value" err
> '
>
> +test_expect_success '--prune-merged: setup' '
> + test_create_repo pm-upstream &&
> + test_commit -C pm-upstream base &&
> + git -C pm-upstream checkout -b next &&
> + test_commit -C pm-upstream one-commit &&
> + test_commit -C pm-upstream two-commit &&
> + git -C pm-upstream branch one HEAD~ &&
> + git -C pm-upstream branch two HEAD &&
> + git -C pm-upstream branch wip main &&
> + git -C pm-upstream checkout main &&
> + test_create_repo pm-fork
> +'
> +
> +test_expect_success '--prune-merged deletes branches integrated into upstream' '
> + test_when_finished "rm -rf pm-merged" &&
> + git clone pm-upstream pm-merged &&
> + git -C pm-merged remote add fork ../pm-fork &&
> + test_config -C pm-merged remote.pushDefault fork &&
> + test_config -C pm-merged push.default current &&
> + git -C pm-merged branch one one-commit &&
> + git -C pm-merged branch --set-upstream-to=origin/next one &&
> + git -C pm-merged branch two two-commit &&
> + git -C pm-merged branch --set-upstream-to=origin/next two &&
> +
> + git -C pm-merged branch --prune-merged "origin/*" &&
> +
> + test_must_fail git -C pm-merged rev-parse --verify refs/heads/one &&
> + test_must_fail git -C pm-merged rev-parse --verify refs/heads/two
> +'
> +
> +test_expect_success '--prune-merged accepts a literal upstream' '
> + test_when_finished "rm -rf pm-literal" &&
> + git clone pm-upstream pm-literal &&
> + git -C pm-literal remote add fork ../pm-fork &&
> + test_config -C pm-literal remote.pushDefault fork &&
> + test_config -C pm-literal push.default current &&
> + git -C pm-literal branch one one-commit &&
> + git -C pm-literal branch --set-upstream-to=origin/next one &&
> +
> + git -C pm-literal branch --prune-merged origin/next &&
> +
> + test_must_fail git -C pm-literal rev-parse --verify refs/heads/one
> +'
> +
> +test_expect_success '--prune-merged unions multiple <branch> arguments' '
> + test_when_finished "rm -rf pm-union" &&
> + git clone pm-upstream pm-union &&
> + git -C pm-union remote add fork ../pm-fork &&
> + test_config -C pm-union remote.pushDefault fork &&
> + test_config -C pm-union push.default current &&
> + git -C pm-union branch one one-commit &&
> + git -C pm-union branch --set-upstream-to=origin/next one &&
> + git -C pm-union branch two base &&
> + git -C pm-union branch --set-upstream-to=origin/main two &&
> + git -C pm-union checkout --detach &&
> +
> + git -C pm-union branch --prune-merged origin/next --prune-merged origin/main &&
> +
> + test_must_fail git -C pm-union rev-parse --verify refs/heads/one &&
> + test_must_fail git -C pm-union rev-parse --verify refs/heads/two
> +'
> +
> +test_expect_success '--prune-merged accepts a local upstream' '
> + test_when_finished "rm -rf pm-local" &&
> + git clone pm-upstream pm-local &&
> + git -C pm-local remote add fork ../pm-fork &&
> + test_config -C pm-local remote.pushDefault fork &&
> + test_config -C pm-local push.default current &&
> + git -C pm-local checkout -b trunk &&
> + git -C pm-local branch one one-commit &&
> + git -C pm-local branch --set-upstream-to=trunk one &&
> + git -C pm-local merge --ff-only one-commit &&
> +
> + git -C pm-local branch --prune-merged trunk &&
> +
> + test_must_fail git -C pm-local rev-parse --verify refs/heads/one
> +'
> +
> +test_expect_success '--prune-merged warns instead of erroring on un-integrated commits' '
> + test_when_finished "rm -rf pm-unmerged" &&
> + git clone pm-upstream pm-unmerged &&
> + git -C pm-unmerged remote add fork ../pm-fork &&
> + test_config -C pm-unmerged remote.pushDefault fork &&
> + test_config -C pm-unmerged push.default current &&
> + git -C pm-unmerged checkout -b wip origin/wip &&
> + git -C pm-unmerged branch --set-upstream-to=origin/next wip &&
> + test_commit -C pm-unmerged local-only &&
> + git -C pm-unmerged checkout - &&
> +
> + git -C pm-unmerged branch --prune-merged "origin/*" 2>err &&
> + test_grep "not fully merged" err &&
> + test_grep ! "If you are sure you want to delete it" err &&
> + git -C pm-unmerged rev-parse --verify refs/heads/wip
> +'
> +
> +test_expect_success '--prune-merged is silent about not-merged-to-HEAD' '
> + test_when_finished "rm -rf pm-nohead" &&
> + git clone pm-upstream pm-nohead &&
> + git -C pm-nohead remote add fork ../pm-fork &&
> + test_config -C pm-nohead remote.pushDefault fork &&
> + test_config -C pm-nohead push.default current &&
> + git -C pm-nohead branch topic one-commit &&
> + git -C pm-nohead branch --set-upstream-to=origin/next topic &&
> +
> + git -C pm-nohead branch --prune-merged "origin/*" 2>err &&
> +
> + test_grep ! "not yet merged to HEAD" err &&
> + test_must_fail git -C pm-nohead rev-parse --verify refs/heads/topic
> +'
> +
> +test_expect_success '--prune-merged skips branches whose upstream is gone' '
> + test_when_finished "rm -rf pm-upstream-gone" &&
> + git clone pm-upstream pm-upstream-gone &&
> + git -C pm-upstream-gone remote add fork ../pm-fork &&
> + test_config -C pm-upstream-gone remote.pushDefault fork &&
> + test_config -C pm-upstream-gone push.default current &&
> + git -C pm-upstream-gone branch one one-commit &&
> + git -C pm-upstream-gone branch --set-upstream-to=origin/next one &&
> +
> + git -C pm-upstream-gone update-ref -d refs/remotes/origin/next &&
> + git -C pm-upstream-gone branch --prune-merged "origin/*" &&
> +
> + git -C pm-upstream-gone rev-parse --verify refs/heads/one
> +'
> +
> +test_expect_success '--prune-merged never deletes the checked-out branch' '
> + test_when_finished "rm -rf pm-head" &&
> + git clone pm-upstream pm-head &&
> + git -C pm-head remote add fork ../pm-fork &&
> + test_config -C pm-head remote.pushDefault fork &&
> + test_config -C pm-head push.default current &&
> + git -C pm-head checkout -b one one-commit &&
> + git -C pm-head branch --set-upstream-to=origin/next one &&
> +
> + git -C pm-head branch --prune-merged "origin/*" &&
> +
> + git -C pm-head rev-parse --verify refs/heads/one
> +'
> +
> +test_expect_success '--prune-merged spares branches that push back to their upstream' '
> + test_when_finished "rm -rf pm-push-eq" &&
> + git clone pm-upstream pm-push-eq &&
> + git -C pm-push-eq checkout --detach &&
> +
> + git -C pm-push-eq branch --prune-merged "origin/*" &&
> +
> + git -C pm-push-eq rev-parse --verify refs/heads/main
> +'
> +
> +test_expect_success '--prune-merged spares a per-branch pushRemote==upstream remote' '
> + test_when_finished "rm -rf pm-push-branch" &&
> + git clone pm-upstream pm-push-branch &&
> + git -C pm-push-branch remote add fork ../pm-fork &&
> + test_config -C pm-push-branch remote.pushDefault fork &&
> + test_config -C pm-push-branch push.default current &&
> + test_config -C pm-push-branch branch.main.pushRemote origin &&
> + git -C pm-push-branch checkout --detach &&
> +
> + git -C pm-push-branch branch --prune-merged "origin/*" &&
> +
> + git -C pm-push-branch rev-parse --verify refs/heads/main
> +'
> +
> +test_expect_success '--prune-merged prunes when @{push} differs from @{upstream}' '
> + test_when_finished "rm -rf pm-push-diff" &&
> + git clone pm-upstream pm-push-diff &&
> + git -C pm-push-diff remote add fork ../pm-fork &&
> + test_config -C pm-push-diff remote.pushDefault fork &&
> + test_config -C pm-push-diff push.default current &&
> + git -C pm-push-diff branch topic one-commit &&
> + git -C pm-push-diff branch --set-upstream-to=origin/next topic &&
> + git -C pm-push-diff checkout --detach &&
> +
> + git -C pm-push-diff branch --prune-merged "origin/*" &&
> +
> + test_must_fail git -C pm-push-diff rev-parse --verify refs/heads/topic
> +'
> +
> +test_expect_success '--prune-merged requires a value' '
> + test_must_fail git -C forked branch --prune-merged 2>err &&
> + test_grep "requires a value" err
> +'
> +
> +test_expect_success '--prune-merged rejects positional arguments' '
> + test_must_fail git -C forked branch --prune-merged origin/one other/foreign 2>err &&
> + test_grep "does not take positional arguments" err
> +'
> +
> test_done
^ permalink raw reply
* Re: [PATCH v12 3/6] branch: prepare delete_branches for a bulk caller
From: Phillip Wood @ 2026-06-05 13:49 UTC (permalink / raw)
To: Harald Nordgren via GitGitGadget, git
Cc: Kristoffer Haugsbakk, Johannes Sixt, Harald Nordgren
In-Reply-To: <004a96f7a447ad8dcbcabeb36502330c2399f829.1780477479.git.gitgitgadget@gmail.com>
Hi Harald
On 03/06/2026 10:04, Harald Nordgren via GitGitGadget wrote:
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> Add no_head_fallback and dry_run flags to delete_branches() so a
> bulk caller (the upcoming --prune-merged) can ask strictly about
> merged-into-upstream without a silent fallback to HEAD, and
> rehearse deletions with the same "Would delete branch ..." wording
> as the live run. Existing callers pass 0 for both and keep current
> behavior.
>
> When no_head_fallback is set, head_rev stays NULL through to
> branch_merged(), whose "merged to X but not yet merged to HEAD"
> reminder otherwise compares against HEAD. For the bulk caller
> every candidate is known to have an upstream, so HEAD is
> irrelevant. Guard the block on head_rev so the NULL case skips
> it instead of treating "NULL != reference_rev" as "diverges from
> HEAD" and emitting a spurious warning.
Same comment as the last patch - use a flags argument rather than lots
of individual booleans that make the call sites hard to read.
Thanks
Phillip
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
> builtin/branch.c | 27 +++++++++++++++++++--------
> 1 file changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 93d8eae891..09afdd9257 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -169,10 +169,13 @@ static int branch_merged(int kind, const char *name,
> * upstream, if any, otherwise with HEAD", we should just
> * return the result of the repo_in_merge_bases() above without
> * any of the following code, but during the transition period,
> - * a gentle reminder is in order.
> + * a gentle reminder is in order. Callers that opt out of the
> + * HEAD fallback by passing head_rev=NULL are not interested in
> + * the reminder either: they have already established that the
> + * branch has an upstream, so HEAD is irrelevant to the decision.
> */
> - if (head_rev != reference_rev) {
> - int expect = head_rev ? repo_in_merge_bases(the_repository, rev, head_rev) : 0;
> + if (head_rev && head_rev != reference_rev) {
> + int expect = repo_in_merge_bases(the_repository, rev, head_rev);
> if (expect < 0)
> exit(128);
> if (expect == merged)
> @@ -225,7 +228,8 @@ static void delete_branch_config(const char *branchname)
> }
>
> static int delete_branches(int argc, const char **argv, int force, int kinds,
> - int quiet, int warn_only)
> + int quiet, int warn_only, int no_head_fallback,
> + int dry_run)
> {
> struct commit *head_rev = NULL;
> struct object_id oid;
> @@ -259,7 +263,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
> }
> branch_name_pos = strcspn(fmt, "%");
>
> - if (!force)
> + if (!force && !no_head_fallback)
> head_rev = lookup_commit_reference(the_repository, &head_oid);
>
> for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
> @@ -330,13 +334,20 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
> free(target);
> }
>
> - if (refs_delete_refs(get_main_ref_store(the_repository), NULL, &refs_to_delete, REF_NO_DEREF))
> + if (!dry_run &&
> + refs_delete_refs(get_main_ref_store(the_repository), NULL, &refs_to_delete, REF_NO_DEREF))
> ret = 1;
>
> for_each_string_list_item(item, &refs_to_delete) {
> char *describe_ref = item->util;
> char *name = item->string;
> - if (!refs_ref_exists(get_main_ref_store(the_repository), name)) {
> + if (dry_run) {
> + if (!quiet)
> + printf(remote_branch
> + ? _("Would delete remote-tracking branch %s (was %s).\n")
> + : _("Would delete branch %s (was %s).\n"),
> + name + branch_name_pos, describe_ref);
> + } else if (!refs_ref_exists(get_main_ref_store(the_repository), name)) {
> char *refname = name + branch_name_pos;
> if (!quiet)
> printf(remote_branch
> @@ -1003,7 +1014,7 @@ int cmd_branch(int argc,
> if (!argc)
> die(_("branch name required"));
> ret = delete_branches(argc, argv, delete > 1, filter.kind,
> - quiet, 0);
> + quiet, 0, 0, 0);
> goto out;
> } else if (show_current) {
> print_current_branch_name();
^ permalink raw reply
* Re: [PATCH v12 2/6] branch: let delete_branches warn instead of error on bulk refusal
From: Phillip Wood @ 2026-06-05 13:49 UTC (permalink / raw)
To: Harald Nordgren via GitGitGadget, git
Cc: Kristoffer Haugsbakk, Johannes Sixt, Harald Nordgren
In-Reply-To: <6c95e4e77cf555194b83eab92c7564e6b639f500.1780477479.git.gitgitgadget@gmail.com>
Hi Harald
On 03/06/2026 10:04, Harald Nordgren via GitGitGadget wrote:
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> Add a warn_only flag to delete_branches() and check_branch_commit()
> so a bulk caller can report not-fully-merged branches as one-line
> warnings and continue, instead of erroring with the four-line "use
> 'git branch -D'" advice that the standalone "git branch -d" path
> emits. Default callers pass 0 and are unaffected.
>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
> builtin/branch.c | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 12711b29cf..93d8eae891 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -192,7 +192,7 @@ static int branch_merged(int kind, const char *name,
>
> static int check_branch_commit(const char *branchname, const char *refname,
> const struct object_id *oid, struct commit *head_rev,
> - int kinds, int force)
> + int kinds, int force, int warn_only)
We've already got two boolean parameters, lets replace those with an
"unsigned int flags" parameter rather than adding a third. That way we
can avoid having to comment each argument as you do in a later patch.
Thanks
Phillip
> {
> struct commit *rev = lookup_commit_reference(the_repository, oid);
> if (!force && !rev) {
> @@ -200,10 +200,16 @@ static int check_branch_commit(const char *branchname, const char *refname,
> return -1;
> }
> if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
> - error(_("the branch '%s' is not fully merged"), branchname);
> - advise_if_enabled(ADVICE_FORCE_DELETE_BRANCH,
> - _("If you are sure you want to delete it, "
> - "run 'git branch -D %s'"), branchname);
> + if (warn_only) {
> + warning(_("the branch '%s' is not fully merged"),
> + branchname);
> + } else {
> + error(_("the branch '%s' is not fully merged"),
> + branchname);
> + advise_if_enabled(ADVICE_FORCE_DELETE_BRANCH,
> + _("If you are sure you want to delete it, "
> + "run 'git branch -D %s'"), branchname);
> + }
> return -1;
> }
> return 0;
> @@ -219,7 +225,7 @@ static void delete_branch_config(const char *branchname)
> }
>
> static int delete_branches(int argc, const char **argv, int force, int kinds,
> - int quiet)
> + int quiet, int warn_only)
> {
> struct commit *head_rev = NULL;
> struct object_id oid;
> @@ -309,8 +315,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>
> if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
> check_branch_commit(bname.buf, name, &oid, head_rev, kinds,
> - force)) {
> - ret = 1;
> + force, warn_only)) {
> + if (!warn_only)
> + ret = 1;
> goto next;
> }
>
> @@ -995,7 +1002,8 @@ int cmd_branch(int argc,
> if (delete) {
> if (!argc)
> die(_("branch name required"));
> - ret = delete_branches(argc, argv, delete > 1, filter.kind, quiet);
> + ret = delete_branches(argc, argv, delete > 1, filter.kind,
> + quiet, 0);
> goto out;
> } else if (show_current) {
> print_current_branch_name();
^ permalink raw reply
* Re: [PATCH v12 1/6] branch: add --forked filter for --list mode
From: Phillip Wood @ 2026-06-05 13:48 UTC (permalink / raw)
To: Harald Nordgren via GitGitGadget, git
Cc: Kristoffer Haugsbakk, Johannes Sixt, Harald Nordgren
In-Reply-To: <8834c424fbd27800636fe21ae73e9cdce75b558a.1780477479.git.gitgitgadget@gmail.com>
Hi Harald
On 03/06/2026 10:04, Harald Nordgren via GitGitGadget wrote:
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> Add a --forked option to "git branch" list mode that keeps only
> branches whose configured upstream matches <branch>. The argument
> can be a ref (e.g. "origin/main", "master") or a shell-style
> glob (e.g. "origin/*"). The option can be repeated to widen the
> filter.
Do we want to support a remote name as an alias for $remote/HEAD to
match "git checkout -b $remote"?
> Because it is a filter on list mode, --forked composes with the
> existing list-mode filters, so
>
> git branch --merged origin/main --forked 'origin/*'
>
> lists branches forked from origin that have already been
> integrated into origin/main, and --no-merged inverts the question.
Nice
> This is the building block for --prune-merged, which deletes the
> listed branches once they have landed on their upstream.
>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
> Documentation/git-branch.adoc | 7 ++
> builtin/branch.c | 147 +++++++++++++++++++++++++++++++++-
> ref-filter.c | 10 +--
> ref-filter.h | 2 +
> t/t3200-branch.sh | 92 +++++++++++++++++++++
> 5 files changed, 249 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc
> index c0afddc424..8002d7f38c 100644
> --- a/Documentation/git-branch.adoc
> +++ b/Documentation/git-branch.adoc
> @@ -14,6 +14,7 @@ git branch [--color[=<when>] | --no-color] [--show-current]
> [--merged [<commit>]] [--no-merged [<commit>]]
> [--contains [<commit>]] [--no-contains [<commit>]]
> [--points-at <object>] [--format=<format>]
> + [(--forked <branch>)...]
Should this come before --format? I think it logically belongs with
--merged and --contains which also filter the output.
> [(-r|--remotes) | (-a|--all)]
> [--list] [<pattern>...]
> git branch [--track[=(direct|inherit)] | --no-track] [-f]
> @@ -199,6 +200,12 @@ This option is only applicable in non-verbose mode.
> Print the name of the current branch. In detached `HEAD` state,
> nothing is printed.
>
> +`--forked <branch>`::
> + List only branches whose configured upstream matches
> + _<branch>_. The argument can be a ref (e.g. `origin/main`,
> + `master`) or a shell-style glob (e.g. `'origin/*'`). The
> + option can be repeated to widen the filter.
This is fine but do we want to add a sentence to the DESCRIPTION as well
where it talks about "--contains" and "--merged"?
> `-v`::
> `-vv`::
> `--verbose`::
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 1572a4f9ef..12711b29cf 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -28,9 +28,10 @@
> #include "help.h"
> #include "advice.h"
> #include "commit-reach.h"
> +#include "wildmatch.h"
>
> static const char * const builtin_branch_usage[] = {
> - N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
> + N_("git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked <branch>)...]"),
> N_("git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]"),
> N_("git branch [<options>] [-l] [<pattern>...]"),
> N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
> @@ -442,8 +443,12 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
> return strbuf_detach(&fmt, NULL);
> }
>
> +static void filter_array_by_forked(struct ref_array *array,
> + const struct string_list *upstreams);
We try to avoid forward declarations unless they're really needed - can
we add the new functions up here instead?
> static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting,
> - struct ref_format *format, struct string_list *output)
> + struct ref_format *format, struct string_list *output,
> + const struct string_list *forked_upstreams)
> {
> int i;
> struct ref_array array;
> @@ -463,6 +468,9 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
>
> filter_refs(&array, filter, filter->kind);
>
> + if (forked_upstreams->nr)
> + filter_array_by_forked(&array, forked_upstreams);
This gets a bit messy below where free elements when we filter "array".
It would be much nicer to do the filtering in apply_ref_filter() so that
we don't have to allocate those in the first place. I think it would
make it simpler to implement --prune-merged as collect_forked_set()
would become a call to filter_refs() and we could support --forked in
"git for-each-ref".
> +static int parse_one_forked_arg(const char *arg, struct upstream_pattern *out)
> +{
> + struct object_id oid;
> + char *full_ref = NULL;
> +
> + if (has_glob_specials(arg)) {
> + out->name = xstrdup(arg);
> + out->is_wildcard = 1;
> + return 0;
> + }
> +
> + if (repo_dwim_ref(the_repository, arg, strlen(arg), &oid,
> + &full_ref, 0) == 1 &&
> + (starts_with(full_ref, "refs/heads/") ||
> + starts_with(full_ref, "refs/remotes/"))) {
> + out->name = xstrdup(short_upstream_name(full_ref));
I don't think abbreviating the refname here is a good idea as short
names are inherently ambiguous - in principle you could have a remote
tracking branch and a local branch with the same short name. It also
means we end up reconstructing the full name in a later patch, instead
we should just call short_upstream_name() where we need the abbreviated
name.
> +static int upstream_matches(const char *short_upstream,
> + const struct upstream_pattern *patterns,
> + size_t nr)
> +{
> + size_t i;
> +
> + for (i = 0; i < nr; i++) {
> + const struct upstream_pattern *p = &patterns[i];
> + if (p->is_wildcard) {
> + if (!wildmatch(p->name, short_upstream, WM_PATHNAME))
> + return 1;
> + } else if (!strcmp(p->name, short_upstream)) {
> + return 1;
> + }
> + }
This is quadratic but maybe we can assume the user wont pass "--forked"
too many times. If this ever becomes a problem we could use an strset
for the exact matches and then we only need to loop over the wildmatch
patterns but we probably don't need to worry about that now.
> +static int branch_upstream_matches(const char *full_refname,
> + const struct upstream_pattern *patterns,
> + size_t nr_patterns)
> +{
> + const char *short_name;
> + struct branch *branch;
> + const char *upstream;
> +
> + if (!skip_prefix(full_refname, "refs/heads/", &short_name))
> + return 0;
> + branch = branch_get(short_name);
> + if (!branch)
> + return 0;
> + upstream = branch_get_upstream(branch, NULL);
> + if (!upstream)
> + return 0;
> + return upstream_matches(short_upstream_name(upstream),
This would be simpler if we matched on full names.
> +static void filter_array_by_forked(struct ref_array *array,
> + const struct string_list *upstreams)
> +{
> + struct upstream_pattern *patterns = NULL;
> + size_t nr_patterns = 0;
> + int i, kept = 0;
> +
> + parse_forked_args(upstreams, &patterns, &nr_patterns);
> +
> + for (i = 0; i < array->nr; i++) {
> + struct ref_array_item *item = array->items[i];
> + if (branch_upstream_matches(item->refname,
> + patterns, nr_patterns))
> + array->items[kept++] = item;
> + else
> + free_ref_array_item(item);
> + }
> + array->nr = kept;
As I said above this would be nicer if it was implemented in
apply_ref_filter().
> @@ -714,6 +847,7 @@ int cmd_branch(int argc,
> /* possible actions */
> int delete = 0, rename = 0, copy = 0, list = 0,
> unset_upstream = 0, show_current = 0, edit_description = 0;
> + struct string_list forked_upstreams = STRING_LIST_INIT_DUP;
Personally I'd use a strvec here as we don't need the "util" member of
the string list but I'm probably biased as I don't really like the
string list api.
I like the idea of making this just another filter to "--list". The
basics of the implementation look reasonable - it should be straight
forward to match on full refs and move the relavent code into filter-refs.c
Thanks
Phillip
> const char *new_upstream = NULL;
> int noncreate_actions = 0;
> /* possible options */
> @@ -767,6 +901,8 @@ int cmd_branch(int argc,
> OPT_BOOL(0, "create-reflog", &reflog, N_("create the branch's reflog")),
> OPT_BOOL(0, "edit-description", &edit_description,
> N_("edit the description for the branch")),
> + OPT_STRING_LIST(0, "forked", &forked_upstreams, N_("branch"),
> + N_("list local branches whose upstream matches <branch> (repeatable)")),
> OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE),
> OPT_MERGED(&filter, N_("print only branches that are merged")),
> OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
> @@ -815,7 +951,8 @@ int cmd_branch(int argc,
> list = 1;
>
> if (filter.with_commit || filter.no_commit ||
> - filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
> + filter.reachable_from || filter.unreachable_from ||
> + filter.points_at.nr || forked_upstreams.nr)
> list = 1;
>
> noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
> @@ -880,7 +1017,8 @@ int cmd_branch(int argc,
> ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
> ref_sorting_set_sort_flags_all(
> sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
> - print_ref_list(&filter, sorting, &format, &output);
> + print_ref_list(&filter, sorting, &format, &output,
> + &forked_upstreams);
> print_columns(&output, colopts, NULL);
> string_list_clear(&output, 0);
> ref_sorting_release(sorting);
> @@ -1020,5 +1158,6 @@ int cmd_branch(int argc,
>
> out:
> string_list_clear(&sorting_options, 0);
> + string_list_clear(&forked_upstreams, 0);
> return ret;
> }
> diff --git a/ref-filter.c b/ref-filter.c
> index 1da4c0e60d..65e7bc6785 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -3035,7 +3035,7 @@ static int filter_one(const struct reference *ref, void *cb_data)
> }
>
> /* Free memory allocated for a ref_array_item */
> -static void free_array_item(struct ref_array_item *item)
> +void free_ref_array_item(struct ref_array_item *item)
> {
> free((char *)item->symref);
> if (item->value) {
> @@ -3078,7 +3078,7 @@ static int filter_and_format_one(const struct reference *ref, void *cb_data)
>
> strbuf_release(&output);
> strbuf_release(&err);
> - free_array_item(item);
> + free_ref_array_item(item);
>
> /*
> * Increment the running count of refs that match the filter. If
> @@ -3098,7 +3098,7 @@ void ref_array_clear(struct ref_array *array)
> int i;
>
> for (i = 0; i < array->nr; i++)
> - free_array_item(array->items[i]);
> + free_ref_array_item(array->items[i]);
> FREE_AND_NULL(array->items);
> array->nr = array->alloc = 0;
>
> @@ -3171,7 +3171,7 @@ static void reach_filter(struct ref_array *array,
> if (is_merged == include_reached)
> array->items[array->nr++] = array->items[i];
> else
> - free_array_item(item);
> + free_ref_array_item(item);
> }
>
> clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
> @@ -3667,7 +3667,7 @@ void pretty_print_ref(const char *name, const struct object_id *oid,
>
> strbuf_release(&err);
> strbuf_release(&output);
> - free_array_item(ref_item);
> + free_ref_array_item(ref_item);
> }
>
> static int parse_sorting_atom(const char *atom)
> diff --git a/ref-filter.h b/ref-filter.h
> index 120221b47f..3883b9dc62 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -155,6 +155,8 @@ void filter_and_format_refs(struct ref_filter *filter, unsigned int type,
> struct ref_format *format);
> /* Clear all memory allocated to ref_array */
> void ref_array_clear(struct ref_array *array);
> +/* Free a single item from a ref_array */
> +void free_ref_array_item(struct ref_array_item *item);
> /* Used to verify if the given format is correct and to parse out the used atoms */
> int verify_ref_format(struct ref_format *format);
> /* Sort the given ref_array as per the ref_sorting provided */
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index e7829c2c4b..4e7deddc04 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -1717,4 +1717,96 @@ test_expect_success 'errors if given a bad branch name' '
> test_cmp expect actual
> '
>
> +test_expect_success '--forked: setup' '
> + test_create_repo forked-upstream &&
> + test_commit -C forked-upstream base &&
> + git -C forked-upstream branch one base &&
> + git -C forked-upstream branch two base &&
> +
> + test_create_repo forked-other &&
> + test_commit -C forked-other other-base &&
> + git -C forked-other branch foreign other-base &&
> +
> + git clone forked-upstream forked &&
> + git -C forked remote add other ../forked-other &&
> + git -C forked fetch other &&
> + git -C forked branch local-base &&
> + git -C forked branch --track local-one origin/one &&
> + git -C forked branch --track local-two origin/two &&
> + git -C forked branch --track local-foreign other/foreign &&
> + git -C forked branch detached &&
> + git -C forked branch --track local-trunk local-base
> +'
> +
> +test_expect_success '--forked <upstream-tracking-branch> filters by upstream' '
> + git -C forked branch --forked origin/one --format="%(refname:short)" >actual &&
> + echo local-one >expect &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked <glob> filters by wildmatch' '
> + git -C forked branch --forked "origin/*" --format="%(refname:short)" >actual &&
> + cat >expect <<-\EOF &&
> + local-one
> + local-two
> + main
> + EOF
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked <local-branch> matches branches with local upstream' '
> + git -C forked branch --forked local-base --format="%(refname:short)" >actual &&
> + echo local-trunk >expect &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked can be repeated to widen the filter' '
> + git -C forked branch --forked origin/one --forked other/foreign --format="%(refname:short)" >actual &&
> + cat >expect <<-\EOF &&
> + local-foreign
> + local-one
> + EOF
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked combines literal and glob arguments' '
> + git -C forked branch --forked local-base --forked "other/*" --format="%(refname:short)" >actual &&
> + cat >expect <<-\EOF &&
> + local-foreign
> + local-trunk
> + EOF
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked "*/*" covers every remote-tracking upstream' '
> + git -C forked branch --forked "*/*" --format="%(refname:short)" >actual &&
> + cat >expect <<-\EOF &&
> + local-foreign
> + local-one
> + local-two
> + main
> + EOF
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked composes with --no-merged' '
> + test_when_finished "git -C forked checkout detached" &&
> + git -C forked checkout local-one &&
> + test_commit -C forked local-only &&
> + git -C forked branch --forked "origin/*" --no-merged origin/one \
> + --format="%(refname:short)" >actual &&
> + echo local-one >expect &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success '--forked rejects unknown branch/pattern' '
> + test_must_fail git -C forked branch --forked nope 2>err &&
> + test_grep "not a valid branch or pattern" err
> +'
> +
> +test_expect_success '--forked requires a value' '
> + test_must_fail git -C forked branch --forked 2>err &&
> + test_grep "requires a value" err
> +'
> +
> test_done
^ permalink raw reply
* Re: [PATCH v2] compat/posix.h: enable UNUSED warning messages for Clang
From: Patrick Steinhardt @ 2026-06-05 13:22 UTC (permalink / raw)
To: Dominik Loidolt; +Cc: gitster, git, asedeno, asedeno, avarab
In-Reply-To: <aiK4BR86cuq5bmCe@four.local>
On Fri, Jun 05, 2026 at 01:50:29PM +0200, Dominik Loidolt wrote:
> Thanks for the review!
>
> I noticed that the version-check style now differs between GCC and the newly
> introduced Clang checks, would it make sense to make them consistent? Like:
>
> diff --git a/compat/posix.h b/compat/posix.h
> index faaae1b655..e20f8ec61e 100644
> --- a/compat/posix.h
> +++ b/compat/posix.h
> @@ -17,7 +17,8 @@
> */
> #if defined(__GNUC__) && defined(__GNUC_MINOR__)
> # define GIT_GNUC_PREREQ(maj, min) \
> - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
> + ((__GNUC__ > (maj)) || \
> + (__GNUC__ == (maj) && (__GNUC_MINOR__ >= (min))))
> #else
> #define GIT_GNUC_PREREQ(maj, min) 0
> #endif
>
> I think the current GCC bit-shift check is harder to read.
> If you agree, I could send a 2-patch v3 series, which would also clean up the
> comment style nit.
I was wondering about that, too. The question that I have is whether
there's any particular reason why the check was written that way. So in
the best case we'd do some digging into the history to figure out why
this looks the way it looks like.
Patrick
^ permalink raw reply
* Re: Mirror repositories for submodules
From: Simon Richter @ 2026-06-05 12:10 UTC (permalink / raw)
To: Benson Muite; +Cc: git
In-Reply-To: <87h5nhr2zp.fsf@emailplus.org>
Hi,
On 6/5/26 2:05 PM, Benson Muite wrote:
> Simon Richter <Simon.Richter@hogyros.de> writes:
>> On the other hand, this can be used to construct a stable relative
>> submodule URL.
> For submodules, the metadata consists of the url of the repository to
> clone from.
That is precisely what precludes mirroring: if I clone and republish a
repository, people can clone from that repository, but will still fetch
submodules from the URLs listed in the .gitmodules file.
If that is a relative URL, then all is (mostly) well: they will also ask
my mirror server for the submodule, and all I have to do is make it
available.
If it is an absolute URL, then I need a side channel to communicate to
the client "you can also get this repository from me." This could, for
example, generate an insteadOf config, but that would be a horrible hack
that becomes unmanageable pretty quickly (updates? security implications?)
Hence this thread: is there a way to represent submodules so that their
identity is independent from the hosting location -- and this ties into
the other thread from last week, giving projects a stable identity that
follows them through clones (or, if someone is using a forge, forks).
The download location for a project is project metadata that lives
outside the project view of time, but it is expressed as (versioned)
data in git, in the .gitmodules file, so if hosting for a project
changes, projects referring to them must either rewrite all of their
history, accept that old versions will no longer be buildable because
they contain a broken link, or expect people/CI to manually generate
insteadOf entries.
So the problem here is that we are treating metadata as data.
Simon
^ permalink raw reply
* Re: [PATCH v2] compat/posix.h: enable UNUSED warning messages for Clang
From: Dominik Loidolt @ 2026-06-05 11:50 UTC (permalink / raw)
To: Patrick Steinhardt; +Cc: gitster, git, asedeno, asedeno, avarab
In-Reply-To: <aiKnqlI7WdcskDAs@pks.im>
Thanks for the review!
I noticed that the version-check style now differs between GCC and the newly
introduced Clang checks, would it make sense to make them consistent? Like:
diff --git a/compat/posix.h b/compat/posix.h
index faaae1b655..e20f8ec61e 100644
--- a/compat/posix.h
+++ b/compat/posix.h
@@ -17,7 +17,8 @@
*/
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
# define GIT_GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+ ((__GNUC__ > (maj)) || \
+ (__GNUC__ == (maj) && (__GNUC_MINOR__ >= (min))))
#else
#define GIT_GNUC_PREREQ(maj, min) 0
#endif
I think the current GCC bit-shift check is harder to read.
If you agree, I could send a 2-patch v3 series, which would also clean up the
comment style nit.
Dominik
^ permalink raw reply related
* Re: [PATCH v2] compat/posix.h: enable UNUSED warning messages for Clang
From: Patrick Steinhardt @ 2026-06-05 10:40 UTC (permalink / raw)
To: Dominik Loidolt; +Cc: gitster, git, asedeno, asedeno, avarab
In-Reply-To: <20260605094647.94805-1-dominik.loidolt@univie.ac.at>
On Fri, Jun 05, 2026 at 11:46:47AM +0200, Dominik Loidolt wrote:
> Use a dedicated Clang version check for the UNUSED macro.
>
> Commit 7c07f36ad2 (git-compat-util.h: GCC deprecated message arg only in
> GCC 4.5+, 2022-10-05) restricted use of the deprecated attribute's
> message argument in the UNUSED macro to GCC 4.5 or newer.
Ah. I was briefly wondering about this because the UNUSED macro already
works. But the important part here is that it's really only about better
diagnostics via the attribute message.
> Clang identifies itself as GNUC 4.2.1 for compatibility, so
> GIT_GNUC_PREREQ(4, 5) does not detect whether Clang supports the
> deprecated("...") form. Add GIT_CLANG_PREREQ() macro and use it to
> enable the UNUSED warning message for Clang 2.9 and newer.
There's a second user of `GIT_GNUC_PREREQ` in "git-compat-util.h", but
that user checks for GCC 3.1. And as Clang identifies as a newer version
we don't have to adapt any other callsites.
> diff --git a/compat/posix.h b/compat/posix.h
> index faaae1b655..88ad29d74b 100644
> --- a/compat/posix.h
> +++ b/compat/posix.h
> @@ -22,6 +22,17 @@
> #define GIT_GNUC_PREREQ(maj, min) 0
> #endif
>
> +/*
> + * Similar for Clang
> + */
Micronit, not worth rerolling over: this could have easily been a single
line: `/* Similar for Clang. */`
> +#if defined(__clang__) && defined(__clang_minor__) && defined(__clang_major__)
> +# define GIT_CLANG_PREREQ(maj, min) \
> + ((__clang_major__ > (maj)) || \
> + (__clang_major__ == (maj) && (__clang_minor__ >= (min))))
> +#else
> +# define GIT_CLANG_PREREQ(maj, min) 0
> +#endif
> +
> /*
> * UNUSED marks a function parameter that is always unused. It also
> * can be used to annotate a function, a variable, or a type that is
> @@ -35,7 +46,7 @@
> * When a parameter may be used or unused, depending on conditional
> * compilation, consider using MAYBE_UNUSED instead.
> */
> -#if GIT_GNUC_PREREQ(4, 5)
> +#if GIT_GNUC_PREREQ(4, 5) || GIT_CLANG_PREREQ(2, 9)
> #define UNUSED __attribute__((unused)) \
> __attribute__((deprecated ("parameter declared as UNUSED")))
> #elif defined(__GNUC__)
Makes sense, thanks!
Patrick
^ permalink raw reply
* [PATCH v2] compat/posix.h: enable UNUSED warning messages for Clang
From: Dominik Loidolt @ 2026-06-05 9:46 UTC (permalink / raw)
To: gitster; +Cc: git, asedeno, asedeno, avarab, Dominik Loidolt
In-Reply-To: <20260503151210.36036-1-dominik.loidolt@univie.ac.at>
Use a dedicated Clang version check for the UNUSED macro.
Commit 7c07f36ad2 (git-compat-util.h: GCC deprecated message arg only in
GCC 4.5+, 2022-10-05) restricted use of the deprecated attribute's
message argument in the UNUSED macro to GCC 4.5 or newer.
Clang identifies itself as GNUC 4.2.1 for compatibility, so
GIT_GNUC_PREREQ(4, 5) does not detect whether Clang supports the
deprecated("...") form. Add GIT_CLANG_PREREQ() macro and use it to
enable the UNUSED warning message for Clang 2.9 and newer.
Signed-off-by: Dominik Loidolt <dominik.loidolt@univie.ac.at>
---
v2:
- add GIT_CLANG_PREREQ()
- require Clang 2.9+ for deprecated("...") in UNUSED
compat/posix.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/compat/posix.h b/compat/posix.h
index faaae1b655..88ad29d74b 100644
--- a/compat/posix.h
+++ b/compat/posix.h
@@ -22,6 +22,17 @@
#define GIT_GNUC_PREREQ(maj, min) 0
#endif
+/*
+ * Similar for Clang
+ */
+#if defined(__clang__) && defined(__clang_minor__) && defined(__clang_major__)
+# define GIT_CLANG_PREREQ(maj, min) \
+ ((__clang_major__ > (maj)) || \
+ (__clang_major__ == (maj) && (__clang_minor__ >= (min))))
+#else
+# define GIT_CLANG_PREREQ(maj, min) 0
+#endif
+
/*
* UNUSED marks a function parameter that is always unused. It also
* can be used to annotate a function, a variable, or a type that is
@@ -35,7 +46,7 @@
* When a parameter may be used or unused, depending on conditional
* compilation, consider using MAYBE_UNUSED instead.
*/
-#if GIT_GNUC_PREREQ(4, 5)
+#if GIT_GNUC_PREREQ(4, 5) || GIT_CLANG_PREREQ(2, 9)
#define UNUSED __attribute__((unused)) \
__attribute__((deprecated ("parameter declared as UNUSED")))
#elif defined(__GNUC__)
base-commit: a89346e34a937f001e5d397ee62224e3e9852040
--
2.54.0
^ permalink raw reply related
* Re: Mirror repositories for submodules
From: Matt Hunter @ 2026-06-05 9:34 UTC (permalink / raw)
To: Benson Muite, Simon Richter, Junio C Hamano; +Cc: git
In-Reply-To: <87pl25r3tz.fsf@emailplus.org>
On Fri Jun 5, 2026 at 12:47 AM EDT, Benson Muite wrote:
>
> For submodules, the metadata consists of the url of the repository to
> clone from. One could have a list of absolute URLs. The default would
> be to assume that the URLs are tried in order, and if a URL times out,
> the next one would be tried. One may want to change the default
> ordering as a user setting, or do a ping test to get obtain content from
> the closest repository.
Another idea is for the client to attempt in a random order as a kind of
load balancing.
>
> As an example, for linphone-desktop, the first part of the .gitmodules
> file contains:
>
> [submodule "linphone-sdk"]
> path = external/linphone-sdk
> url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
> [submodule "external/google/gn"]
>
> This could be updated to
>
> [submodule "linphone-sdk"]
> path = external/linphone-sdk
> url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
> url = https://github.com/BelledonneCommunications/linphone-sdk.git
> [submodule "external/google/gn"]
Relevant to Junio's earlier comment about aiming for a general solution:
It looks like the remote URL configuration already supports multiple
URLs per a single entry. It's just that git only considers the first in
the list for fetching, and will push to all.
Your proposed change to .gitmodules may be used to initialize the list
of URLs for a cloned submodule's (single) initial remote? At this
point, any kind of mirror management logic could generically operate on
each remote's URL list.
From git-config(1):
remote.<name>.url
The URL of a remote repository. See git-fetch(1) or git-push(1).
A configured remote can have multiple URLs; in this case the first
is used for fetching, and all are used for pushing (assuming no
remote.<name>.pushurl is defined). Setting this key to the empty
string clears the list of urls, allowing you to override earlier
config.
From gitmodules(5):
submodule.<name>.url
Defines a URL from which the submodule repository can be cloned.
This may be either an absolute URL ready to be passed to
git-clone(1) or (if it begins with ./ or ../) a location relative
to the superproject’s origin repository.
Note that the submodule format seems to explicitly support only a single
value right now. Of course, I am assuming that the implementation
matches the documentation.
^ permalink raw reply
* Re: [PATCH] compat/posix.h: enable UNUSED warning messages for Clang
From: Dominik Loidolt @ 2026-06-05 8:44 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Alejandro R Sedeño, Alejandro R. Sedeño,
Ævar Arnfjörð Bjarmason
In-Reply-To: <xmqqqznsossj.fsf@gitster.g>
On Mon, May 04, 2026 at 10:41:16AM +0900, Junio C Hamano wrote:
> > Does this "drop support" because you force _all_ versions of Clang
> > to use the "deprecated" attribute, even though you _know_ some older
> > versions do not understand it? Don't these versions identify
> > themselves so that you can do
> >
> > #if defined(__clang__) && CLANG_VERSION >= 2.9
>
> IOW, something like this, perhaps?
Yes, you're right. My original patch breaks older Clang versions for no
good reason.
I'll send a v2 with an explicit Clang version check, as you suggested.
Thanks,
Dominik
^ permalink raw reply
* Re: Message from Debaashish Nandi
From: Weijie Yuan @ 2026-06-05 6:43 UTC (permalink / raw)
To: Debaashish Nandi; +Cc: git
In-Reply-To: <fcb34925-f10c-4fc4-826d-a55217101ec8@localhost>
On Thu, Jun 04, 2026 at 06:37:12PM +0000, Debaashish Nandi wrote:
> Hello, is there any game playing which l can understand how git works ?
You may try this:
https://learngitbranching.js.org/
source code:
https://github.com/pcottle/learnGitBranching
^ permalink raw reply
* Re: Mirror repositories for submodules
From: Benson Muite @ 2026-06-05 5:05 UTC (permalink / raw)
To: Simon Richter, Junio C Hamano; +Cc: git
In-Reply-To: <d64e7f31-4e00-478c-ab31-b671242865fb@hogyros.de>
Simon Richter <Simon.Richter@hogyros.de> writes:
> Hi,
>
> On 6/4/26 10:09 AM, Junio C Hamano wrote:
>
>> So, no, I do not think a contribution to add mirror repositories as
>> alternate submodule sources should be considered for inclusion, as
>> it artificially limits usefulness of the feature. A feature to add
>> mirror repositories as alternate sources might be worth considering,
>> though.
>
> This is relevant to the Debian use case: we run a git server that
> archives git trees for Debian packages, and ideally the objects on this
> server should be identical to what you get from upstream projects.
>
> This is a big problem for archiving projects that use submodules,
> because we cannot alter the reference URLs.
>
> Cloning from our server will, depending on what upstream uses, either a
> relative URL (which will go to our server, but we have little control
> over what the name part of the repository base URL is going to be), or
> an absolute URL that instructs clients to pull from another place, which
> conflicts with our goal to have a self-contained archive.
>
> The idea posited earlier, to have a "repository identity" that remains
> the same across forks and clones, is somewhat appealing, but the best
> idea I can come up with is generating some kind of repository UUID, and
> adding a symlink -- not a great design because it pollutes outside the repo:
>
> $ mkdir myproject
> $ cd myproject
> $ git init
> $ ls -l ..
> lrwxrwxrwx 1 simon simon 9 Jun 4 14:05
> 12345678-9abc-def0-1234-56789abcdef0.git -> myproject
> drwxrwxr-x 2 simon simon 40 Jun 4 14:04 myproject
>
> On the other hand, this can be used to construct a stable relative
> submodule URL.
>
> Making the symlinks optional would require keeping a list of local
> clones and their UUIDs, and resolving them.
>
> I don't like that design, but as I said it's the best idea I have for now.
>
For submodules, the metadata consists of the url of the repository to
clone from. One could have a list of absolute URLs. The default would
be to assume that the URLs are tried in order, and if a URL times out,
the next one would be tried. One may want to change the default
ordering as a user setting, or do a ping test to get obtain content from
the closest repository.
As an example, for linphone-desktop, the first part of the .gitmodules
file contains:
[submodule "linphone-sdk"]
path = external/linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
[submodule "external/google/gn"]
This could be updated to
[submodule "linphone-sdk"]
path = external/linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
url = https://github.com/BelledonneCommunications/linphone-sdk.git
[submodule "external/google/gn"]
> I also fully expect that Debian's servers will be used by a lot of
> people outside the project as soon as it becomes a convenient fallback,
> in the same way people are pulling .orig.tar.gz archives from Debian
> mirrors, so we need to make it easy to set up a mirror, to allow this to
> scale.
>
> Simon
^ permalink raw reply
* Re: Mirror repositories for submodules
From: Benson Muite @ 2026-06-05 4:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <xmqqcxy7qfgk.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> Benson Muite <benson_muite@emailplus.org> writes:
>
>> Would a contribution to add mirror repositories as alternate submodule
>> sources be considered for inclusion? Some projects have mirror
>> repositories on other hosting services, and may have bandwidth limits on
>> their primary hosting service. Being able to indicate mirror
>> repositories for where to check for updates and sources for submodules
>> when doing `git clone --recurse-submodules https://my.repo ` or `git
>> submodule update --init --recursive` would be helpful when there is a
>> timeout.
>
> I do not see why such a "oh, the repository at $URL1 seems to be
> down, but we know $URL2 serves the equivalent information, so let's
> go there instead" feature has to be limited to submodule use case.
>
> So, no, I do not think a contribution to add mirror repositories as
> alternate submodule sources should be considered for inclusion, as
> it artificially limits usefulness of the feature. A feature to add
> mirror repositories as alternate sources might be worth considering,
> though.
Thanks for the feedback. This was motivated by problems when trying to
recursively clone, but a more general solution is also fine.
^ permalink raw reply
* Re: Mirror repositories for submodules
From: Benson Muite @ 2026-06-05 4:54 UTC (permalink / raw)
To: Jeff King, Simon Richter; +Cc: Junio C Hamano, git
In-Reply-To: <20260604061605.GA3194609@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Thu, Jun 04, 2026 at 02:11:38PM +0900, Simon Richter wrote:
>
>> Cloning from our server will, depending on what upstream uses, either a
>> relative URL (which will go to our server, but we have little control over
>> what the name part of the repository base URL is going to be), or an
>> absolute URL that instructs clients to pull from another place, which
>> conflicts with our goal to have a self-contained archive.
>>
>> The idea posited earlier, to have a "repository identity" that remains the
>> same across forks and clones, is somewhat appealing, but the best idea I can
>> come up with is generating some kind of repository UUID, and adding a
>> symlink -- not a great design because it pollutes outside the repo:
>>
>> $ mkdir myproject
>> $ cd myproject
>> $ git init
>> $ ls -l ..
>> lrwxrwxrwx 1 simon simon 9 Jun 4 14:05
>> 12345678-9abc-def0-1234-56789abcdef0.git -> myproject
>> drwxrwxr-x 2 simon simon 40 Jun 4 14:04 myproject
>>
>> On the other hand, this can be used to construct a stable relative submodule
>> URL.
>
> Here's a thought experiment. What if you put the UUID into a URL, like:
>
> repoid://123456789.git
>
> Then your in-repo .gitconfig would point to that repo id and be
> consistent. Of course you need some way to tell Git how to retrieve
> repoid:// URLs. You could do so with a custom remote helper
> (git-remote-repoid), but presumably that helper is eventually going to
> end up going over one of the normal Git protocols.
>
> So we just need to tell Git how to resolve repo id URLs into concrete
> URLs. And indeed, we have url.*.insteadOf to do rewriting already. So
> for example, you can add a submodule but convert it into a uuid like
> this:
>
> $ git submodule add https://github.com/git/git.git
> $ git config -f .gitmodules submodule.git.url
> https://github.com/git/git.git
> $ git config -f .gitmodules submodule.git.url repoid://123456789.git
> $ git commit -am 'add submodule with magic repoid'
>
> Now if somebody else comes along and clones it naively, the repo uuid is
> not useful to git by itself:
>
> $ git clone --recurse-submodules repo
> Submodule 'git' (repoid://123456789.git) registered for path 'git'
> Cloning into '/home/peff/tmp/repo/git'...
> fatal: transport 'repoid' not allowed
> fatal: clone of 'repoid://123456789.git' into submodule path '/home/peff/tmp/repo/git' failed
>
> But imagine that "somehow" they have learned that 123456789.git can be
> found at some URL. You can do this:
>
> git -c url.https://github.com/git/git.git.insteadOf=repoid://123456789.git \
> clone --recurse-submodules repo.git
>
> which would clone from the original URL. Or you could even imagine that
> they have a cache of repositories named by uuid, and then:
>
> git -c url.https://my/cache/.insteadOf=repoid:// ...
>
> would rewrite all repoid://'s automatically.
>
> The use of "-c" here is mostly for illustration. It is a per-command
> config, so when you later try to update the submodule, you'd run into
> the same problem. Probably you'd want to stuff your mapping into on-disk
> config (either ~/.gitconfig, or if you have a lot of them, perhaps some
> file included from there).
>
> It would be nice if you could use "git clone -c" (note "-c" as an option
> to "clone", not to "git") to set a permanent per-repo config variable.
> But sadly the URL rewriting happens in the submodule repository, not the
> parent. So it has to be a per-user setting.
>
>
> Now, all of that said, do we still need uuids at all? If the canonical
> submodule name is https://github.com/git/git.git, then anybody can just
> rewrite that locally in the same way using url.*.insteadOf config. And I
> think this is a pretty standard way of using submodules. E.g., you might
> rewrite https:// into ssh:// if you prefer that protocol. Or point to a
> local server if it's faster for you.
>
> Which makes me wonder if I am missing something about the original
> request that started this thread. But it sounds to me like it is just
> asking for the existing URL-rewriting feature.
>
The problem is that one might have multiple repositories, submodules
may themselves have submodules. Typically a primary development
organization will have its own host, but may also have mirrors on other
services which maybe more convenient for others to use. A recursive
clone could give upto 20 repositories not all of which are maintained by
the same organization. URL-rewriting each of them can be inefficient,
especially when the upstream maintains the mirror repositories and can
indicate that in the source repositories.
> -Peff
^ permalink raw reply
* Re: Mirror repositories for submodules
From: Benson Muite @ 2026-06-05 4:47 UTC (permalink / raw)
To: Simon Richter, Junio C Hamano; +Cc: git
In-Reply-To: <d64e7f31-4e00-478c-ab31-b671242865fb@hogyros.de>
Simon Richter <Simon.Richter@hogyros.de> writes:
> Hi,
>
> On 6/4/26 10:09 AM, Junio C Hamano wrote:
>
>> So, no, I do not think a contribution to add mirror repositories as
>> alternate submodule sources should be considered for inclusion, as
>> it artificially limits usefulness of the feature. A feature to add
>> mirror repositories as alternate sources might be worth considering,
>> though.
>
> This is relevant to the Debian use case: we run a git server that
> archives git trees for Debian packages, and ideally the objects on this
> server should be identical to what you get from upstream projects.
>
> This is a big problem for archiving projects that use submodules,
> because we cannot alter the reference URLs.
>
> Cloning from our server will, depending on what upstream uses, either a
> relative URL (which will go to our server, but we have little control
> over what the name part of the repository base URL is going to be), or
> an absolute URL that instructs clients to pull from another place, which
> conflicts with our goal to have a self-contained archive.
>
> The idea posited earlier, to have a "repository identity" that remains
> the same across forks and clones, is somewhat appealing, but the best
> idea I can come up with is generating some kind of repository UUID, and
> adding a symlink -- not a great design because it pollutes outside the repo:
>
> $ mkdir myproject
> $ cd myproject
> $ git init
> $ ls -l ..
> lrwxrwxrwx 1 simon simon 9 Jun 4 14:05
> 12345678-9abc-def0-1234-56789abcdef0.git -> myproject
> drwxrwxr-x 2 simon simon 40 Jun 4 14:04 myproject
>
> On the other hand, this can be used to construct a stable relative
> submodule URL.
>
> Making the symlinks optional would require keeping a list of local
> clones and their UUIDs, and resolving them.
>
> I don't like that design, but as I said it's the best idea I have for now.
>
> I also fully expect that Debian's servers will be used by a lot of
> people outside the project as soon as it becomes a convenient fallback,
> in the same way people are pulling .orig.tar.gz archives from Debian
> mirrors, so we need to make it easy to set up a mirror, to allow this to
> scale.
>
For submodules, the metadata consists of the url of the repository to
clone from. One could have a list of absolute URLs. The default would
be to assume that the URLs are tried in order, and if a URL times out,
the next one would be tried. One may want to change the default
ordering as a user setting, or do a ping test to get obtain content from
the closest repository.
As an example, for linphone-desktop, the first part of the .gitmodules
file contains:
[submodule "linphone-sdk"]
path = external/linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
[submodule "external/google/gn"]
This could be updated to
[submodule "linphone-sdk"]
path = external/linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
url = https://github.com/BelledonneCommunications/linphone-sdk.git
[submodule "external/google/gn"]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox