diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-08-23 19:36:59 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 14:56:43 -0700 |
| commit | d0c39a49ccb5dfe7feba4325c3374d99ab123c59 (patch) | |
| tree | 26324606aadeab067d1d983de881a392488fac8e /revision.c | |
| parent | 419221c1065981311b1a0f4a469d4d8a9ea09f54 (diff) | |
| download | git-d0c39a49ccb5dfe7feba4325c3374d99ab123c59.tar.gz | |
revision.c: --all adds HEAD from all worktrees
Unless single_worktree is set, --all now adds HEAD from all worktrees.
Since reachable.c code does not use setup_revisions(), we need to call
other_head_refs_submodule() explicitly there to have the same effect on
"git prune", so that we won't accidentally delete objects needed by some
other HEADs.
A new FIXME is added because we would need something like
int refs_other_head_refs(struct ref_store *, each_ref_fn, cb_data);
in addition to other_head_refs() to handle it, which might require
int get_submodule_worktrees(const char *submodule, int flags);
It could be a separate topic to reduce the scope of this one.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 8d04516266..0e98444857 100644 --- a/revision.c +++ b/revision.c @@ -2133,6 +2133,14 @@ static int handle_revision_pseudo_opt(const char *submodule, int argcount; if (submodule) { + /* + * We need some something like get_submodule_worktrees() + * before we can go through all worktrees of a submodule, + * .e.g with adding all HEADs from --all, which is not + * supported right now, so stick to single worktree. + */ + if (!revs->single_worktree) + die("BUG: --single-worktree cannot be used together with submodule"); refs = get_submodule_ref_store(submodule); } else refs = get_main_ref_store(); @@ -2150,6 +2158,12 @@ static int handle_revision_pseudo_opt(const char *submodule, if (!strcmp(arg, "--all")) { handle_refs(refs, revs, *flags, refs_for_each_ref); handle_refs(refs, revs, *flags, refs_head_ref); + if (!revs->single_worktree) { + struct all_refs_cb cb; + + init_all_refs_cb(&cb, revs, *flags); + other_head_refs(handle_one_ref, &cb); + } clear_ref_exclusion(&revs->ref_excludes); } else if (!strcmp(arg, "--branches")) { handle_refs(refs, revs, *flags, refs_for_each_branch_ref); |