Merge branch 'gc/branch-recurse-submodules'
"git branch" learned the "--recurse-submodules" option. * gc/branch-recurse-submodules: branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks branch: add --recurse-submodules option for branch creation builtin/branch: consolidate action-picking logic in cmd_branch() branch: add a dry_run parameter to create_branch() branch: make create_branch() always create a branch branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
This commit is contained in:
Junio C Hamano
commit
5cc9522b15
@ -116,6 +116,9 @@ advice.*::
|
||||
submoduleAlternateErrorStrategyDie::
|
||||
Advice shown when a submodule.alternateErrorStrategy option
|
||||
configured to "die" causes a fatal error.
|
||||
submodulesNotUpdated::
|
||||
Advice shown when a user runs a submodule command that fails
|
||||
because `git submodule update --init` was not run.
|
||||
addIgnoredFile::
|
||||
Advice shown if a user attempts to add an ignored file to
|
||||
the index.
|
||||
|
||||
@ -59,18 +59,33 @@ submodule.active::
|
||||
|
||||
submodule.recurse::
|
||||
A boolean indicating if commands should enable the `--recurse-submodules`
|
||||
option by default.
|
||||
Applies to all commands that support this option
|
||||
(`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
|
||||
`restore` and `switch`) except `clone` and `ls-files`.
|
||||
option by default. Defaults to false.
|
||||
+
|
||||
When set to true, it can be deactivated via the
|
||||
`--no-recurse-submodules` option. Note that some Git commands
|
||||
lacking this option may call some of the above commands affected by
|
||||
`submodule.recurse`; for instance `git remote update` will call
|
||||
`git fetch` but does not have a `--no-recurse-submodules` option.
|
||||
For these commands a workaround is to temporarily change the
|
||||
configuration value by using `git -c submodule.recurse=0`.
|
||||
+
|
||||
The following list shows the commands that accept
|
||||
`--recurse-submodules` and whether they are supported by this
|
||||
setting.
|
||||
|
||||
* `checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`,
|
||||
`reset`, `restore` and `switch` are always supported.
|
||||
* `clone` and `ls-files` are not supported.
|
||||
* `branch` is supported only if `submodule.propagateBranches` is
|
||||
enabled
|
||||
|
||||
submodule.propagateBranches::
|
||||
[EXPERIMENTAL] A boolean that enables branching support when
|
||||
using `--recurse-submodules` or `submodule.recurse=true`.
|
||||
Enabling this will allow certain commands to accept
|
||||
`--recurse-submodules` and certain commands that already accept
|
||||
`--recurse-submodules` will now consider branches.
|
||||
Defaults to false.
|
||||
When set to true, it can be deactivated via the
|
||||
`--no-recurse-submodules` option. Note that some Git commands
|
||||
lacking this option may call some of the above commands affected by
|
||||
`submodule.recurse`; for instance `git remote update` will call
|
||||
`git fetch` but does not have a `--no-recurse-submodules` option.
|
||||
For these commands a workaround is to temporarily change the
|
||||
configuration value by using `git -c submodule.recurse=0`.
|
||||
|
||||
submodule.fetchJobs::
|
||||
Specifies how many submodules are fetched/cloned at the same time.
|
||||
|
||||
@ -16,7 +16,8 @@ SYNOPSIS
|
||||
[--points-at <object>] [--format=<format>]
|
||||
[(-r | --remotes) | (-a | --all)]
|
||||
[--list] [<pattern>...]
|
||||
'git branch' [--track[=(direct|inherit)] | --no-track] [-f] <branchname> [<start-point>]
|
||||
'git branch' [--track[=(direct|inherit)] | --no-track] [-f]
|
||||
[--recurse-submodules] <branchname> [<start-point>]
|
||||
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
|
||||
'git branch' --unset-upstream [<branchname>]
|
||||
'git branch' (-m | -M) [<oldbranch>] <newbranch>
|
||||
@ -235,6 +236,22 @@ how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
|
||||
Do not set up "upstream" configuration, even if the
|
||||
branch.autoSetupMerge configuration variable is set.
|
||||
|
||||
--recurse-submodules::
|
||||
THIS OPTION IS EXPERIMENTAL! Causes the current command to
|
||||
recurse into submodules if `submodule.propagateBranches` is
|
||||
enabled. See `submodule.propagateBranches` in
|
||||
linkgit:git-config[1]. Currently, only branch creation is
|
||||
supported.
|
||||
+
|
||||
When used in branch creation, a new branch <branchname> will be created
|
||||
in the superproject and all of the submodules in the superproject's
|
||||
<start-point>. In submodules, the branch will point to the submodule
|
||||
commit in the superproject's <start-point> but the branch's tracking
|
||||
information will be set up based on the submodule's branches and remotes
|
||||
e.g. `git branch --recurse-submodules topic origin/main` will create the
|
||||
submodule branch "topic" that points to the submodule commit in the
|
||||
superproject's "origin/main", but tracks the submodule's "origin/main".
|
||||
|
||||
--set-upstream::
|
||||
As this option had confusing syntax, it is no longer supported.
|
||||
Please use `--track` or `--set-upstream-to` instead.
|
||||
|
||||
1
advice.c
1
advice.c
@ -70,6 +70,7 @@ static struct {
|
||||
[ADVICE_STATUS_HINTS] = { "statusHints", 1 },
|
||||
[ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 },
|
||||
[ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 },
|
||||
[ADVICE_SUBMODULES_NOT_UPDATED] = { "submodulesNotUpdated", 1 },
|
||||
[ADVICE_UPDATE_SPARSE_PATH] = { "updateSparsePath", 1 },
|
||||
[ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 },
|
||||
};
|
||||
|
||||
1
advice.h
1
advice.h
@ -44,6 +44,7 @@ struct string_list;
|
||||
ADVICE_STATUS_HINTS,
|
||||
ADVICE_STATUS_U_OPTION,
|
||||
ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
|
||||
ADVICE_SUBMODULES_NOT_UPDATED,
|
||||
ADVICE_UPDATE_SPARSE_PATH,
|
||||
ADVICE_WAITING_FOR_EDITOR,
|
||||
ADVICE_SKIPPED_CHERRY_PICKS,
|
||||
|
||||
277
branch.c
277
branch.c
@ -8,6 +8,8 @@
|
||||
#include "sequencer.h"
|
||||
#include "commit.h"
|
||||
#include "worktree.h"
|
||||
#include "submodule-config.h"
|
||||
#include "run-command.h"
|
||||
|
||||
struct tracking {
|
||||
struct refspec_item spec;
|
||||
@ -218,9 +220,11 @@ static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
|
||||
}
|
||||
|
||||
/*
|
||||
* This is called when new_ref is branched off of orig_ref, and tries
|
||||
* to infer the settings for branch.<new_ref>.{remote,merge} from the
|
||||
* config.
|
||||
* Used internally to set the branch.<new_ref>.{remote,merge} config
|
||||
* settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
|
||||
* dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
|
||||
* will not be expanded to "refs/remotes/origin/main", so it is not safe
|
||||
* for 'orig_ref' to be raw user input.
|
||||
*/
|
||||
static void setup_tracking(const char *new_ref, const char *orig_ref,
|
||||
enum branch_track track, int quiet)
|
||||
@ -235,7 +239,7 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
|
||||
if (track != BRANCH_TRACK_INHERIT)
|
||||
for_each_remote(find_tracked_branch, &tracking);
|
||||
else if (inherit_tracking(&tracking, orig_ref))
|
||||
return;
|
||||
goto cleanup;
|
||||
|
||||
if (!tracking.matches)
|
||||
switch (track) {
|
||||
@ -245,7 +249,7 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
|
||||
case BRANCH_TRACK_INHERIT:
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (tracking.matches > 1)
|
||||
@ -258,7 +262,8 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
|
||||
tracking.remote, tracking.srcs) < 0)
|
||||
exit(-1);
|
||||
|
||||
string_list_clear(tracking.srcs, 0);
|
||||
cleanup:
|
||||
string_list_clear(&tracking_srcs, 0);
|
||||
}
|
||||
|
||||
int read_branch_desc(struct strbuf *buf, const char *branch_name)
|
||||
@ -346,31 +351,37 @@ N_("\n"
|
||||
"will track its remote counterpart, you may want to use\n"
|
||||
"\"git push -u\" to set the upstream config as you push.");
|
||||
|
||||
void create_branch(struct repository *r,
|
||||
const char *name, const char *start_name,
|
||||
int force, int clobber_head_ok, int reflog,
|
||||
int quiet, enum branch_track track)
|
||||
/**
|
||||
* DWIMs a user-provided ref to determine the starting point for a
|
||||
* branch and validates it, where:
|
||||
*
|
||||
* - r is the repository to validate the branch for
|
||||
*
|
||||
* - start_name is the ref that we would like to test. This is
|
||||
* expanded with DWIM and assigned to out_real_ref.
|
||||
*
|
||||
* - track is the tracking mode of the new branch. If tracking is
|
||||
* explicitly requested, start_name must be a branch (because
|
||||
* otherwise start_name cannot be tracked)
|
||||
*
|
||||
* - out_oid is an out parameter containing the object_id of start_name
|
||||
*
|
||||
* - out_real_ref is an out parameter containing the full, 'real' form
|
||||
* of start_name e.g. refs/heads/main instead of main
|
||||
*
|
||||
*/
|
||||
static void dwim_branch_start(struct repository *r, const char *start_name,
|
||||
enum branch_track track, char **out_real_ref,
|
||||
struct object_id *out_oid)
|
||||
{
|
||||
struct commit *commit;
|
||||
struct object_id oid;
|
||||
char *real_ref;
|
||||
struct strbuf ref = STRBUF_INIT;
|
||||
int forcing = 0;
|
||||
int dont_change_ref = 0;
|
||||
int explicit_tracking = 0;
|
||||
|
||||
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
|
||||
explicit_tracking = 1;
|
||||
|
||||
if ((track == BRANCH_TRACK_OVERRIDE || clobber_head_ok)
|
||||
? validate_branchname(name, &ref)
|
||||
: validate_new_branchname(name, &ref, force)) {
|
||||
if (!force)
|
||||
dont_change_ref = 1;
|
||||
else
|
||||
forcing = 1;
|
||||
}
|
||||
|
||||
real_ref = NULL;
|
||||
if (get_oid_mb(start_name, &oid)) {
|
||||
if (explicit_tracking) {
|
||||
@ -407,40 +418,218 @@ void create_branch(struct repository *r,
|
||||
|
||||
if ((commit = lookup_commit_reference(r, &oid)) == NULL)
|
||||
die(_("not a valid branch point: '%s'"), start_name);
|
||||
oidcpy(&oid, &commit->object.oid);
|
||||
if (out_real_ref) {
|
||||
*out_real_ref = real_ref;
|
||||
real_ref = NULL;
|
||||
}
|
||||
if (out_oid)
|
||||
oidcpy(out_oid, &commit->object.oid);
|
||||
|
||||
FREE_AND_NULL(real_ref);
|
||||
}
|
||||
|
||||
void create_branch(struct repository *r,
|
||||
const char *name, const char *start_name,
|
||||
int force, int clobber_head_ok, int reflog,
|
||||
int quiet, enum branch_track track, int dry_run)
|
||||
{
|
||||
struct object_id oid;
|
||||
char *real_ref;
|
||||
struct strbuf ref = STRBUF_INIT;
|
||||
int forcing = 0;
|
||||
struct ref_transaction *transaction;
|
||||
struct strbuf err = STRBUF_INIT;
|
||||
char *msg;
|
||||
|
||||
if (track == BRANCH_TRACK_OVERRIDE)
|
||||
BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
|
||||
if (clobber_head_ok && !force)
|
||||
BUG("'clobber_head_ok' can only be used with 'force'");
|
||||
|
||||
if (clobber_head_ok ?
|
||||
validate_branchname(name, &ref) :
|
||||
validate_new_branchname(name, &ref, force)) {
|
||||
forcing = 1;
|
||||
}
|
||||
|
||||
dwim_branch_start(r, start_name, track, &real_ref, &oid);
|
||||
if (dry_run)
|
||||
goto cleanup;
|
||||
|
||||
if (reflog)
|
||||
log_all_ref_updates = LOG_REFS_NORMAL;
|
||||
|
||||
if (!dont_change_ref) {
|
||||
struct ref_transaction *transaction;
|
||||
struct strbuf err = STRBUF_INIT;
|
||||
char *msg;
|
||||
|
||||
if (forcing)
|
||||
msg = xstrfmt("branch: Reset to %s", start_name);
|
||||
else
|
||||
msg = xstrfmt("branch: Created from %s", start_name);
|
||||
|
||||
transaction = ref_transaction_begin(&err);
|
||||
if (!transaction ||
|
||||
ref_transaction_update(transaction, ref.buf,
|
||||
&oid, forcing ? NULL : null_oid(),
|
||||
0, msg, &err) ||
|
||||
ref_transaction_commit(transaction, &err))
|
||||
die("%s", err.buf);
|
||||
ref_transaction_free(transaction);
|
||||
strbuf_release(&err);
|
||||
free(msg);
|
||||
}
|
||||
if (forcing)
|
||||
msg = xstrfmt("branch: Reset to %s", start_name);
|
||||
else
|
||||
msg = xstrfmt("branch: Created from %s", start_name);
|
||||
transaction = ref_transaction_begin(&err);
|
||||
if (!transaction ||
|
||||
ref_transaction_update(transaction, ref.buf,
|
||||
&oid, forcing ? NULL : null_oid(),
|
||||
0, msg, &err) ||
|
||||
ref_transaction_commit(transaction, &err))
|
||||
die("%s", err.buf);
|
||||
ref_transaction_free(transaction);
|
||||
strbuf_release(&err);
|
||||
free(msg);
|
||||
|
||||
if (real_ref && track)
|
||||
setup_tracking(ref.buf + 11, real_ref, track, quiet);
|
||||
|
||||
cleanup:
|
||||
strbuf_release(&ref);
|
||||
free(real_ref);
|
||||
}
|
||||
|
||||
void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
|
||||
const char *orig_ref, enum branch_track track,
|
||||
int quiet)
|
||||
{
|
||||
char *real_orig_ref;
|
||||
dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
|
||||
setup_tracking(new_ref, real_orig_ref, track, quiet);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a branch in a submodule by calling
|
||||
* create_branches_recursively() in a child process. The child process
|
||||
* is necessary because install_branch_config_multiple_remotes() (which
|
||||
* is called by setup_tracking()) does not support writing configs to
|
||||
* submodules.
|
||||
*/
|
||||
static int submodule_create_branch(struct repository *r,
|
||||
const struct submodule *submodule,
|
||||
const char *name, const char *start_oid,
|
||||
const char *tracking_name, int force,
|
||||
int reflog, int quiet,
|
||||
enum branch_track track, int dry_run)
|
||||
{
|
||||
int ret = 0;
|
||||
struct child_process child = CHILD_PROCESS_INIT;
|
||||
struct strbuf child_err = STRBUF_INIT;
|
||||
struct strbuf out_buf = STRBUF_INIT;
|
||||
char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
|
||||
child.git_cmd = 1;
|
||||
child.err = -1;
|
||||
child.stdout_to_stderr = 1;
|
||||
|
||||
prepare_other_repo_env(&child.env_array, r->gitdir);
|
||||
/*
|
||||
* submodule_create_branch() is indirectly invoked by "git
|
||||
* branch", but we cannot invoke "git branch" in the child
|
||||
* process. "git branch" accepts a branch name and start point,
|
||||
* where the start point is assumed to provide both the OID
|
||||
* (start_oid) and the branch to use for tracking
|
||||
* (tracking_name). But when recursing through submodules,
|
||||
* start_oid and tracking name need to be specified separately
|
||||
* (see create_branches_recursively()).
|
||||
*/
|
||||
strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
|
||||
if (dry_run)
|
||||
strvec_push(&child.args, "--dry-run");
|
||||
if (force)
|
||||
strvec_push(&child.args, "--force");
|
||||
if (quiet)
|
||||
strvec_push(&child.args, "--quiet");
|
||||
if (reflog)
|
||||
strvec_push(&child.args, "--create-reflog");
|
||||
if (track == BRANCH_TRACK_ALWAYS || track == BRANCH_TRACK_EXPLICIT)
|
||||
strvec_push(&child.args, "--track");
|
||||
|
||||
strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
|
||||
|
||||
if ((ret = start_command(&child)))
|
||||
return ret;
|
||||
ret = finish_command(&child);
|
||||
strbuf_read(&child_err, child.err, 0);
|
||||
strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
|
||||
|
||||
if (ret)
|
||||
fprintf(stderr, "%s", out_buf.buf);
|
||||
else
|
||||
printf("%s", out_buf.buf);
|
||||
|
||||
strbuf_release(&child_err);
|
||||
strbuf_release(&out_buf);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void create_branches_recursively(struct repository *r, const char *name,
|
||||
const char *start_commitish,
|
||||
const char *tracking_name, int force,
|
||||
int reflog, int quiet, enum branch_track track,
|
||||
int dry_run)
|
||||
{
|
||||
int i = 0;
|
||||
char *branch_point = NULL;
|
||||
struct object_id super_oid;
|
||||
struct submodule_entry_list submodule_entry_list;
|
||||
|
||||
/* Perform dwim on start_commitish to get super_oid and branch_point. */
|
||||
dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
|
||||
&branch_point, &super_oid);
|
||||
|
||||
/*
|
||||
* If we were not given an explicit name to track, then assume we are at
|
||||
* the top level and, just like the non-recursive case, the tracking
|
||||
* name is the branch point.
|
||||
*/
|
||||
if (!tracking_name)
|
||||
tracking_name = branch_point;
|
||||
|
||||
submodules_of_tree(r, &super_oid, &submodule_entry_list);
|
||||
/*
|
||||
* Before creating any branches, first check that the branch can
|
||||
* be created in every submodule.
|
||||
*/
|
||||
for (i = 0; i < submodule_entry_list.entry_nr; i++) {
|
||||
if (submodule_entry_list.entries[i].repo == NULL) {
|
||||
if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
|
||||
advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
|
||||
start_commitish);
|
||||
die(_("submodule '%s': unable to find submodule"),
|
||||
submodule_entry_list.entries[i].submodule->name);
|
||||
}
|
||||
|
||||
if (submodule_create_branch(
|
||||
submodule_entry_list.entries[i].repo,
|
||||
submodule_entry_list.entries[i].submodule, name,
|
||||
oid_to_hex(&submodule_entry_list.entries[i]
|
||||
.name_entry->oid),
|
||||
tracking_name, force, reflog, quiet, track, 1))
|
||||
die(_("submodule '%s': cannot create branch '%s'"),
|
||||
submodule_entry_list.entries[i].submodule->name,
|
||||
name);
|
||||
}
|
||||
|
||||
create_branch(the_repository, name, start_commitish, force, 0, reflog, quiet,
|
||||
BRANCH_TRACK_NEVER, dry_run);
|
||||
if (dry_run)
|
||||
return;
|
||||
/*
|
||||
* NEEDSWORK If tracking was set up in the superproject but not the
|
||||
* submodule, users might expect "git branch --recurse-submodules" to
|
||||
* fail or give a warning, but this is not yet implemented because it is
|
||||
* tedious to determine whether or not tracking was set up in the
|
||||
* superproject.
|
||||
*/
|
||||
setup_tracking(name, tracking_name, track, quiet);
|
||||
|
||||
for (i = 0; i < submodule_entry_list.entry_nr; i++) {
|
||||
if (submodule_create_branch(
|
||||
submodule_entry_list.entries[i].repo,
|
||||
submodule_entry_list.entries[i].submodule, name,
|
||||
oid_to_hex(&submodule_entry_list.entries[i]
|
||||
.name_entry->oid),
|
||||
tracking_name, force, reflog, quiet, track, 0))
|
||||
die(_("submodule '%s': cannot create branch '%s'"),
|
||||
submodule_entry_list.entries[i].submodule->name,
|
||||
name);
|
||||
repo_clear(submodule_entry_list.entries[i].repo);
|
||||
}
|
||||
}
|
||||
|
||||
void remove_merge_branch_state(struct repository *r)
|
||||
{
|
||||
unlink(git_path_merge_head(r));
|
||||
|
||||
60
branch.h
60
branch.h
@ -18,6 +18,28 @@ extern enum branch_track git_branch_track;
|
||||
|
||||
/* Functions for acting on the information about branches. */
|
||||
|
||||
/**
|
||||
* Sets branch.<new_ref>.{remote,merge} config settings such that
|
||||
* new_ref tracks orig_ref according to the specified tracking mode.
|
||||
*
|
||||
* - new_ref is the name of the branch that we are setting tracking
|
||||
* for.
|
||||
*
|
||||
* - orig_ref is the name of the ref that is 'upstream' of new_ref.
|
||||
* orig_ref will be expanded with DWIM so that the config settings
|
||||
* are in the correct format e.g. "refs/remotes/origin/main" instead
|
||||
* of "origin/main".
|
||||
*
|
||||
* - track is the tracking mode e.g. BRANCH_TRACK_REMOTE causes
|
||||
* new_ref to track orig_ref directly, whereas BRANCH_TRACK_INHERIT
|
||||
* causes new_ref to track whatever orig_ref tracks.
|
||||
*
|
||||
* - quiet suppresses tracking information.
|
||||
*/
|
||||
void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
|
||||
const char *orig_ref, enum branch_track track,
|
||||
int quiet);
|
||||
|
||||
/*
|
||||
* Creates a new branch, where:
|
||||
*
|
||||
@ -30,8 +52,8 @@ extern enum branch_track git_branch_track;
|
||||
*
|
||||
* - force enables overwriting an existing (non-head) branch
|
||||
*
|
||||
* - clobber_head_ok allows the currently checked out (hence existing)
|
||||
* branch to be overwritten; without 'force', it has no effect.
|
||||
* - clobber_head_ok, when enabled with 'force', allows the currently
|
||||
* checked out (head) branch to be overwritten
|
||||
*
|
||||
* - reflog creates a reflog for the branch
|
||||
*
|
||||
@ -40,12 +62,44 @@ extern enum branch_track git_branch_track;
|
||||
* - track causes the new branch to be configured to merge the remote branch
|
||||
* that start_name is a tracking branch for (if any).
|
||||
*
|
||||
* - dry_run causes the branch to be validated but not created.
|
||||
*
|
||||
*/
|
||||
void create_branch(struct repository *r,
|
||||
const char *name, const char *start_name,
|
||||
int force, int clobber_head_ok,
|
||||
int reflog, int quiet, enum branch_track track);
|
||||
int reflog, int quiet, enum branch_track track,
|
||||
int dry_run);
|
||||
|
||||
/*
|
||||
* Creates a new branch in a repository and its submodules (and its
|
||||
* submodules, recursively). The parameters are mostly analogous to
|
||||
* those of create_branch() except for start_name, which is represented
|
||||
* by two different parameters:
|
||||
*
|
||||
* - start_commitish is the commit-ish, in repository r, that determines
|
||||
* which commits the branches will point to. The superproject branch
|
||||
* will point to the commit of start_commitish and the submodule
|
||||
* branches will point to the gitlink commit oids in start_commitish's
|
||||
* tree.
|
||||
*
|
||||
* - tracking_name is the name of the ref, in repository r, that will be
|
||||
* used to set up tracking information. This value is propagated to
|
||||
* all submodules, which will evaluate the ref using their own ref
|
||||
* stores. If NULL, this defaults to start_commitish.
|
||||
*
|
||||
* When this function is called on the superproject, start_commitish
|
||||
* can be any user-provided ref and tracking_name can be NULL (similar
|
||||
* to create_branches()). But when recursing through submodules,
|
||||
* start_commitish is the plain gitlink commit oid. Since the oid cannot
|
||||
* be used for tracking information, tracking_name is propagated and
|
||||
* used for tracking instead.
|
||||
*/
|
||||
void create_branches_recursively(struct repository *r, const char *name,
|
||||
const char *start_commitish,
|
||||
const char *tracking_name, int force,
|
||||
int reflog, int quiet, enum branch_track track,
|
||||
int dry_run);
|
||||
/*
|
||||
* Check if 'name' can be a valid name for a branch; die otherwise.
|
||||
* Return 1 if the named branch already exists; return 0 otherwise.
|
||||
|
||||
@ -27,7 +27,8 @@
|
||||
|
||||
static const char * const builtin_branch_usage[] = {
|
||||
N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
|
||||
N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
|
||||
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>..."),
|
||||
N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
|
||||
N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
|
||||
@ -38,6 +39,8 @@ static const char * const builtin_branch_usage[] = {
|
||||
|
||||
static const char *head;
|
||||
static struct object_id head_oid;
|
||||
static int recurse_submodules = 0;
|
||||
static int submodule_propagate_branches = 0;
|
||||
|
||||
static int branch_use_color = -1;
|
||||
static char branch_colors[][COLOR_MAXLEN] = {
|
||||
@ -99,6 +102,15 @@ static int git_branch_config(const char *var, const char *value, void *cb)
|
||||
return config_error_nonbool(var);
|
||||
return color_parse(value, branch_colors[slot]);
|
||||
}
|
||||
if (!strcmp(var, "submodule.recurse")) {
|
||||
recurse_submodules = git_config_bool(var, value);
|
||||
return 0;
|
||||
}
|
||||
if (!strcasecmp(var, "submodule.propagateBranches")) {
|
||||
submodule_propagate_branches = git_config_bool(var, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return git_color_default_config(var, value, cb);
|
||||
}
|
||||
|
||||
@ -621,14 +633,16 @@ static int edit_branch_description(const char *branch_name)
|
||||
|
||||
int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
|
||||
int show_current = 0;
|
||||
int reflog = 0, edit_description = 0;
|
||||
int quiet = 0, unset_upstream = 0;
|
||||
/* possible actions */
|
||||
int delete = 0, rename = 0, copy = 0, list = 0,
|
||||
unset_upstream = 0, show_current = 0, edit_description = 0;
|
||||
const char *new_upstream = NULL;
|
||||
int noncreate_actions = 0;
|
||||
/* possible options */
|
||||
int reflog = 0, quiet = 0, icase = 0, force = 0,
|
||||
recurse_submodules_explicit = 0;
|
||||
enum branch_track track;
|
||||
struct ref_filter filter;
|
||||
int icase = 0;
|
||||
static struct ref_sorting *sorting;
|
||||
struct string_list sorting_options = STRING_LIST_INIT_DUP;
|
||||
struct ref_format format = REF_FORMAT_INIT;
|
||||
@ -677,6 +691,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
OPT_CALLBACK(0, "points-at", &filter.points_at, N_("object"),
|
||||
N_("print only branches of the object"), parse_opt_object_name),
|
||||
OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
|
||||
OPT_BOOL(0, "recurse-submodules", &recurse_submodules_explicit, N_("recurse through submodules")),
|
||||
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
|
||||
OPT_END(),
|
||||
};
|
||||
@ -713,10 +728,23 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
|
||||
list = 1;
|
||||
|
||||
if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
|
||||
list + edit_description + unset_upstream > 1)
|
||||
noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
|
||||
!!show_current + !!list + !!edit_description +
|
||||
!!unset_upstream;
|
||||
if (noncreate_actions > 1)
|
||||
usage_with_options(builtin_branch_usage, options);
|
||||
|
||||
if (recurse_submodules_explicit) {
|
||||
if (!submodule_propagate_branches)
|
||||
die(_("branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled"));
|
||||
if (noncreate_actions)
|
||||
die(_("--recurse-submodules can only be used to create branches"));
|
||||
}
|
||||
|
||||
recurse_submodules =
|
||||
(recurse_submodules || recurse_submodules_explicit) &&
|
||||
submodule_propagate_branches;
|
||||
|
||||
if (filter.abbrev == -1)
|
||||
filter.abbrev = DEFAULT_ABBREV;
|
||||
filter.ignore_case = icase;
|
||||
@ -828,12 +856,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
if (!ref_exists(branch->refname))
|
||||
die(_("branch '%s' does not exist"), branch->name);
|
||||
|
||||
/*
|
||||
* create_branch takes care of setting up the tracking
|
||||
* info and making sure new_upstream is correct
|
||||
*/
|
||||
create_branch(the_repository, branch->name, new_upstream,
|
||||
0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
|
||||
dwim_and_setup_tracking(the_repository, branch->name,
|
||||
new_upstream, BRANCH_TRACK_OVERRIDE,
|
||||
quiet);
|
||||
} else if (unset_upstream) {
|
||||
struct branch *branch = branch_get(argv[0]);
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
@ -857,7 +882,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
strbuf_addf(&buf, "branch.%s.merge", branch->name);
|
||||
git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
|
||||
strbuf_release(&buf);
|
||||
} else if (argc > 0 && argc <= 2) {
|
||||
} else if (!noncreate_actions && argc > 0 && argc <= 2) {
|
||||
const char *branch_name = argv[0];
|
||||
const char *start_name = argc == 2 ? argv[1] : head;
|
||||
|
||||
if (filter.kind != FILTER_REFS_BRANCHES)
|
||||
die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
|
||||
"Did you mean to use: -a|-r --list <pattern>?"));
|
||||
@ -865,10 +893,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
if (track == BRANCH_TRACK_OVERRIDE)
|
||||
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
|
||||
|
||||
create_branch(the_repository,
|
||||
argv[0], (argc == 2) ? argv[1] : head,
|
||||
force, 0, reflog, quiet, track);
|
||||
|
||||
if (recurse_submodules) {
|
||||
create_branches_recursively(the_repository, branch_name,
|
||||
start_name, NULL, force,
|
||||
reflog, quiet, track, 0);
|
||||
return 0;
|
||||
}
|
||||
create_branch(the_repository, branch_name, start_name, force, 0,
|
||||
reflog, quiet, track, 0);
|
||||
} else
|
||||
usage_with_options(builtin_branch_usage, options);
|
||||
|
||||
|
||||
@ -909,7 +909,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
|
||||
opts->new_branch_force ? 1 : 0,
|
||||
opts->new_branch_log,
|
||||
opts->quiet,
|
||||
opts->track);
|
||||
opts->track,
|
||||
0);
|
||||
free(new_branch_info->name);
|
||||
free(new_branch_info->refname);
|
||||
new_branch_info->name = xstrdup(opts->new_branch);
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
#include "diff.h"
|
||||
#include "object-store.h"
|
||||
#include "advice.h"
|
||||
#include "branch.h"
|
||||
|
||||
#define OPT_QUIET (1 << 0)
|
||||
#define OPT_CACHED (1 << 1)
|
||||
@ -2984,6 +2985,42 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
|
||||
return !!ret;
|
||||
}
|
||||
|
||||
static int module_create_branch(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
enum branch_track track;
|
||||
int quiet = 0, force = 0, reflog = 0, dry_run = 0;
|
||||
|
||||
struct option options[] = {
|
||||
OPT__QUIET(&quiet, N_("print only error messages")),
|
||||
OPT__FORCE(&force, N_("force creation"), 0),
|
||||
OPT_BOOL(0, "create-reflog", &reflog,
|
||||
N_("create the branch's reflog")),
|
||||
OPT_SET_INT('t', "track", &track,
|
||||
N_("set up tracking mode (see git-pull(1))"),
|
||||
BRANCH_TRACK_EXPLICIT),
|
||||
OPT__DRY_RUN(&dry_run,
|
||||
N_("show whether the branch would be created")),
|
||||
OPT_END()
|
||||
};
|
||||
const char *const usage[] = {
|
||||
N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
|
||||
NULL
|
||||
};
|
||||
|
||||
git_config(git_default_config, NULL);
|
||||
track = git_branch_track;
|
||||
argc = parse_options(argc, argv, prefix, options, usage, 0);
|
||||
|
||||
if (argc != 3)
|
||||
usage_with_options(usage, options);
|
||||
|
||||
if (!quiet && !dry_run)
|
||||
printf_ln(_("creating branch '%s'"), argv[0]);
|
||||
|
||||
create_branches_recursively(the_repository, argv[0], argv[1], argv[2],
|
||||
force, reflog, quiet, track, dry_run);
|
||||
return 0;
|
||||
}
|
||||
struct add_data {
|
||||
const char *prefix;
|
||||
const char *branch;
|
||||
@ -3390,6 +3427,7 @@ static struct cmd_struct commands[] = {
|
||||
{"config", module_config, 0},
|
||||
{"set-url", module_set_url, 0},
|
||||
{"set-branch", module_set_branch, 0},
|
||||
{"create-branch", module_create_branch, 0},
|
||||
};
|
||||
|
||||
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
#include "strbuf.h"
|
||||
#include "object-store.h"
|
||||
#include "parse-options.h"
|
||||
#include "tree-walk.h"
|
||||
|
||||
/*
|
||||
* submodule cache lookup structure
|
||||
@ -726,6 +727,66 @@ const struct submodule *submodule_from_path(struct repository *r,
|
||||
return config_from(r->submodule_cache, treeish_name, path, lookup_path);
|
||||
}
|
||||
|
||||
/**
|
||||
* Used internally by submodules_of_tree(). Recurses into 'treeish_name'
|
||||
* and appends submodule entries to 'out'. The submodule_cache expects
|
||||
* a root-level treeish_name and paths, so keep track of these values
|
||||
* with 'root_tree' and 'prefix'.
|
||||
*/
|
||||
static void traverse_tree_submodules(struct repository *r,
|
||||
const struct object_id *root_tree,
|
||||
char *prefix,
|
||||
const struct object_id *treeish_name,
|
||||
struct submodule_entry_list *out)
|
||||
{
|
||||
struct tree_desc tree;
|
||||
struct submodule_tree_entry *st_entry;
|
||||
struct name_entry *name_entry;
|
||||
char *tree_path = NULL;
|
||||
|
||||
name_entry = xmalloc(sizeof(*name_entry));
|
||||
|
||||
fill_tree_descriptor(r, &tree, treeish_name);
|
||||
while (tree_entry(&tree, name_entry)) {
|
||||
if (prefix)
|
||||
tree_path =
|
||||
mkpathdup("%s/%s", prefix, name_entry->path);
|
||||
else
|
||||
tree_path = xstrdup(name_entry->path);
|
||||
|
||||
if (S_ISGITLINK(name_entry->mode) &&
|
||||
is_tree_submodule_active(r, root_tree, tree_path)) {
|
||||
st_entry = xmalloc(sizeof(*st_entry));
|
||||
st_entry->name_entry = xmalloc(sizeof(*st_entry->name_entry));
|
||||
*st_entry->name_entry = *name_entry;
|
||||
st_entry->submodule =
|
||||
submodule_from_path(r, root_tree, tree_path);
|
||||
st_entry->repo = xmalloc(sizeof(*st_entry->repo));
|
||||
if (repo_submodule_init(st_entry->repo, r, tree_path,
|
||||
root_tree))
|
||||
FREE_AND_NULL(st_entry->repo);
|
||||
|
||||
ALLOC_GROW(out->entries, out->entry_nr + 1,
|
||||
out->entry_alloc);
|
||||
out->entries[out->entry_nr++] = *st_entry;
|
||||
} else if (S_ISDIR(name_entry->mode))
|
||||
traverse_tree_submodules(r, root_tree, tree_path,
|
||||
&name_entry->oid, out);
|
||||
free(tree_path);
|
||||
}
|
||||
}
|
||||
|
||||
void submodules_of_tree(struct repository *r,
|
||||
const struct object_id *treeish_name,
|
||||
struct submodule_entry_list *out)
|
||||
{
|
||||
CALLOC_ARRAY(out->entries, 0);
|
||||
out->entry_nr = 0;
|
||||
out->entry_alloc = 0;
|
||||
|
||||
traverse_tree_submodules(r, treeish_name, NULL, treeish_name, out);
|
||||
}
|
||||
|
||||
void submodule_free(struct repository *r)
|
||||
{
|
||||
if (r->submodule_cache)
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#include "hashmap.h"
|
||||
#include "submodule.h"
|
||||
#include "strbuf.h"
|
||||
#include "tree-walk.h"
|
||||
|
||||
/**
|
||||
* The submodule config cache API allows to read submodule
|
||||
@ -101,4 +102,37 @@ int check_submodule_name(const char *name);
|
||||
void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
|
||||
void update_clone_config_from_gitmodules(int *max_jobs);
|
||||
|
||||
/*
|
||||
* Submodule entry that contains relevant information about a
|
||||
* submodule in a tree.
|
||||
*/
|
||||
struct submodule_tree_entry {
|
||||
/* The submodule's tree entry. */
|
||||
struct name_entry *name_entry;
|
||||
/*
|
||||
* A struct repository corresponding to the submodule. May be
|
||||
* NULL if the submodule has not been updated.
|
||||
*/
|
||||
struct repository *repo;
|
||||
/*
|
||||
* A struct submodule containing the submodule config in the
|
||||
* tree's .gitmodules.
|
||||
*/
|
||||
const struct submodule *submodule;
|
||||
};
|
||||
|
||||
struct submodule_entry_list {
|
||||
struct submodule_tree_entry *entries;
|
||||
int entry_nr;
|
||||
int entry_alloc;
|
||||
};
|
||||
|
||||
/**
|
||||
* Given a treeish, return all submodules in the tree and its subtrees,
|
||||
* but excluding nested submodules. Callers that require nested
|
||||
* submodules are expected to recurse into the submodules themselves.
|
||||
*/
|
||||
void submodules_of_tree(struct repository *r,
|
||||
const struct object_id *treeish_name,
|
||||
struct submodule_entry_list *ret);
|
||||
#endif /* SUBMODULE_CONFIG_H */
|
||||
|
||||
11
submodule.c
11
submodule.c
@ -267,7 +267,9 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
|
||||
* ie, the config looks like: "[submodule] active\n".
|
||||
* Since that is an invalid pathspec, we should inform the user.
|
||||
*/
|
||||
int is_submodule_active(struct repository *repo, const char *path)
|
||||
int is_tree_submodule_active(struct repository *repo,
|
||||
const struct object_id *treeish_name,
|
||||
const char *path)
|
||||
{
|
||||
int ret = 0;
|
||||
char *key = NULL;
|
||||
@ -275,7 +277,7 @@ int is_submodule_active(struct repository *repo, const char *path)
|
||||
const struct string_list *sl;
|
||||
const struct submodule *module;
|
||||
|
||||
module = submodule_from_path(repo, null_oid(), path);
|
||||
module = submodule_from_path(repo, treeish_name, path);
|
||||
|
||||
/* early return if there isn't a path->module mapping */
|
||||
if (!module)
|
||||
@ -317,6 +319,11 @@ int is_submodule_active(struct repository *repo, const char *path)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int is_submodule_active(struct repository *repo, const char *path)
|
||||
{
|
||||
return is_tree_submodule_active(repo, null_oid(), path);
|
||||
}
|
||||
|
||||
int is_submodule_populated_gently(const char *path, int *return_error_code)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
@ -54,6 +54,9 @@ int git_default_submodule_config(const char *var, const char *value, void *cb);
|
||||
struct option;
|
||||
int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
|
||||
const char *arg, int unset);
|
||||
int is_tree_submodule_active(struct repository *repo,
|
||||
const struct object_id *treeish_name,
|
||||
const char *path);
|
||||
int is_submodule_active(struct repository *repo, const char *path);
|
||||
/*
|
||||
* Determine if a submodule has been populated at a given 'path' by checking if
|
||||
|
||||
@ -42,6 +42,23 @@ test_expect_success 'git branch abc should create a branch' '
|
||||
git branch abc && test_path_is_file .git/refs/heads/abc
|
||||
'
|
||||
|
||||
test_expect_success 'git branch abc should fail when abc exists' '
|
||||
test_must_fail git branch abc
|
||||
'
|
||||
|
||||
test_expect_success 'git branch --force abc should fail when abc is checked out' '
|
||||
test_when_finished git switch main &&
|
||||
git switch abc &&
|
||||
test_must_fail git branch --force abc HEAD~1
|
||||
'
|
||||
|
||||
test_expect_success 'git branch --force abc should succeed when abc exists' '
|
||||
git rev-parse HEAD~1 >expect &&
|
||||
git branch --force abc HEAD~1 &&
|
||||
git rev-parse abc >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'git branch a/b/c should create a branch' '
|
||||
git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
|
||||
'
|
||||
|
||||
292
t/t3207-branch-submodule.sh
Executable file
292
t/t3207-branch-submodule.sh
Executable file
@ -0,0 +1,292 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='git branch submodule tests'
|
||||
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-rebase.sh
|
||||
|
||||
pwd=$(pwd)
|
||||
|
||||
# Creates a clean test environment in "pwd" by copying the repo setup
|
||||
# from test_dirs.
|
||||
reset_test () {
|
||||
rm -fr super &&
|
||||
rm -fr sub-sub-upstream &&
|
||||
rm -fr sub-upstream &&
|
||||
cp -r test_dirs/* .
|
||||
}
|
||||
|
||||
# Tests that the expected branch does not exist
|
||||
test_no_branch () {
|
||||
DIR=$1 &&
|
||||
BRANCH_NAME=$2 &&
|
||||
test_must_fail git -C "$DIR" rev-parse "$BRANCH_NAME" 2>err &&
|
||||
grep "ambiguous argument .$BRANCH_NAME." err
|
||||
}
|
||||
|
||||
test_expect_success 'setup superproject and submodule' '
|
||||
mkdir test_dirs &&
|
||||
(
|
||||
cd test_dirs &&
|
||||
git init super &&
|
||||
test_commit -C super foo &&
|
||||
git init sub-sub-upstream &&
|
||||
test_commit -C sub-sub-upstream foo &&
|
||||
git init sub-upstream &&
|
||||
# Submodule in a submodule
|
||||
git -C sub-upstream submodule add "${pwd}/test_dirs/sub-sub-upstream" sub-sub &&
|
||||
git -C sub-upstream commit -m "add submodule" &&
|
||||
# Regular submodule
|
||||
git -C super submodule add "${pwd}/test_dirs/sub-upstream" sub &&
|
||||
# Submodule in a subdirectory
|
||||
git -C super submodule add "${pwd}/test_dirs/sub-sub-upstream" second/sub &&
|
||||
git -C super commit -m "add submodule" &&
|
||||
git -C super config submodule.propagateBranches true &&
|
||||
git -C super/sub submodule update --init
|
||||
) &&
|
||||
reset_test
|
||||
'
|
||||
|
||||
# Test the argument parsing
|
||||
test_expect_success '--recurse-submodules should create branches' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a &&
|
||||
git rev-parse branch-a &&
|
||||
git -C sub rev-parse branch-a &&
|
||||
git -C sub/sub-sub rev-parse branch-a &&
|
||||
git -C second/sub rev-parse branch-a
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '--recurse-submodules should die if submodule.propagateBranches is false' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
echo "fatal: branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled" >expected &&
|
||||
test_must_fail git -c submodule.propagateBranches=false branch --recurse-submodules branch-a 2>actual &&
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '--recurse-submodules should fail when not creating branches' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a &&
|
||||
echo "fatal: --recurse-submodules can only be used to create branches" >expected &&
|
||||
test_must_fail git branch --recurse-submodules -D branch-a 2>actual &&
|
||||
test_cmp expected actual &&
|
||||
# Assert that the branches were not deleted
|
||||
git rev-parse branch-a &&
|
||||
git -C sub rev-parse branch-a
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should respect submodule.recurse when creating branches' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git -c submodule.recurse=true branch branch-a &&
|
||||
git rev-parse branch-a &&
|
||||
git -C sub rev-parse branch-a
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should ignore submodule.recurse when not creating branches' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a &&
|
||||
git -c submodule.recurse=true branch -D branch-a &&
|
||||
test_no_branch . branch-a &&
|
||||
git -C sub rev-parse branch-a
|
||||
)
|
||||
'
|
||||
|
||||
# Test branch creation behavior
|
||||
test_expect_success 'should create branches based off commit id in superproject' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a &&
|
||||
git checkout --recurse-submodules branch-a &&
|
||||
git -C sub rev-parse HEAD >expected &&
|
||||
# Move the tip of sub:branch-a so that it no longer matches the commit in super:branch-a
|
||||
git -C sub checkout branch-a &&
|
||||
test_commit -C sub bar &&
|
||||
# Create a new branch-b branch with start-point=branch-a
|
||||
git branch --recurse-submodules branch-b branch-a &&
|
||||
git rev-parse branch-b &&
|
||||
git -C sub rev-parse branch-b >actual &&
|
||||
# Assert that the commit id of sub:second-branch matches super:branch-a and not sub:branch-a
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should not create any branches if branch is not valid for all repos' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git -C sub branch branch-a &&
|
||||
test_must_fail git branch --recurse-submodules branch-a 2>actual &&
|
||||
test_no_branch . branch-a &&
|
||||
grep "submodule .sub.: fatal: a branch named .branch-a. already exists" actual
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should create branches if branch exists and --force is given' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git -C sub rev-parse HEAD >expected &&
|
||||
test_commit -C sub baz &&
|
||||
# branch-a in sub now points to a newer commit.
|
||||
git -C sub branch branch-a HEAD &&
|
||||
git -C sub rev-parse branch-a >actual-old-branch-a &&
|
||||
git branch --recurse-submodules --force branch-a &&
|
||||
git rev-parse branch-a &&
|
||||
git -C sub rev-parse branch-a >actual-new-branch-a &&
|
||||
test_cmp expected actual-new-branch-a &&
|
||||
# assert that branch --force actually moved the sub
|
||||
# branch
|
||||
! test_cmp expected actual-old-branch-a
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should create branch when submodule is not in HEAD:.gitmodules' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch branch-a &&
|
||||
git checkout -b branch-b &&
|
||||
git submodule add ../sub-upstream sub2 &&
|
||||
git -C sub2 submodule update --init &&
|
||||
# branch-b now has a committed submodule not in branch-a
|
||||
git commit -m "add second submodule" &&
|
||||
git checkout branch-a &&
|
||||
git branch --recurse-submodules branch-c branch-b &&
|
||||
git checkout --recurse-submodules branch-c &&
|
||||
git -C sub2 rev-parse branch-c &&
|
||||
git -C sub2/sub-sub rev-parse branch-c
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should not create branches in inactive submodules' '
|
||||
test_when_finished "reset_test" &&
|
||||
test_config -C super submodule.sub.active false &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a &&
|
||||
git rev-parse branch-a &&
|
||||
test_no_branch sub branch-a
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should set up tracking of local branches with track=always' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git -c branch.autoSetupMerge=always branch --recurse-submodules branch-a main &&
|
||||
git -C sub rev-parse main &&
|
||||
test_cmp_config -C sub . branch.branch-a.remote &&
|
||||
test_cmp_config -C sub refs/heads/main branch.branch-a.merge
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should set up tracking of local branches with explicit track' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --track --recurse-submodules branch-a main &&
|
||||
git -C sub rev-parse main &&
|
||||
test_cmp_config -C sub . branch.branch-a.remote &&
|
||||
test_cmp_config -C sub refs/heads/main branch.branch-a.merge
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should not set up unnecessary tracking of local branches' '
|
||||
test_when_finished "reset_test" &&
|
||||
(
|
||||
cd super &&
|
||||
git branch --recurse-submodules branch-a main &&
|
||||
git -C sub rev-parse main &&
|
||||
test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
|
||||
test_cmp_config -C sub "" --default "" branch.branch-a.merge
|
||||
)
|
||||
'
|
||||
|
||||
reset_remote_test () {
|
||||
rm -fr super-clone &&
|
||||
reset_test
|
||||
}
|
||||
|
||||
test_expect_success 'setup tests with remotes' '
|
||||
(
|
||||
cd test_dirs &&
|
||||
(
|
||||
cd super &&
|
||||
git branch branch-a &&
|
||||
git checkout -b branch-b &&
|
||||
git submodule add ../sub-upstream sub2 &&
|
||||
# branch-b now has a committed submodule not in branch-a
|
||||
git commit -m "add second submodule"
|
||||
) &&
|
||||
git clone --branch main --recurse-submodules super super-clone &&
|
||||
git -C super-clone config submodule.propagateBranches true
|
||||
) &&
|
||||
reset_remote_test
|
||||
'
|
||||
|
||||
test_expect_success 'should get fatal error upon branch creation when submodule is not in .git/modules' '
|
||||
test_when_finished "reset_remote_test" &&
|
||||
(
|
||||
cd super-clone &&
|
||||
# This should succeed because super-clone has sub in .git/modules
|
||||
git branch --recurse-submodules branch-a origin/branch-a &&
|
||||
# This should fail because super-clone does not have sub2 .git/modules
|
||||
test_must_fail git branch --recurse-submodules branch-b origin/branch-b 2>actual &&
|
||||
grep "fatal: submodule .sub2.: unable to find submodule" actual &&
|
||||
test_no_branch . branch-b &&
|
||||
test_no_branch sub branch-b &&
|
||||
# User can fix themselves by initializing the submodule
|
||||
git checkout origin/branch-b &&
|
||||
git submodule update --init --recursive &&
|
||||
git branch --recurse-submodules branch-b origin/branch-b
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should set up tracking of remote-tracking branches' '
|
||||
test_when_finished "reset_remote_test" &&
|
||||
(
|
||||
cd super-clone &&
|
||||
git branch --recurse-submodules branch-a origin/branch-a &&
|
||||
test_cmp_config origin branch.branch-a.remote &&
|
||||
test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
|
||||
# "origin/branch-a" does not exist for "sub", but it matches the refspec
|
||||
# so tracking should be set up
|
||||
test_cmp_config -C sub origin branch.branch-a.remote &&
|
||||
test_cmp_config -C sub refs/heads/branch-a branch.branch-a.merge &&
|
||||
test_cmp_config -C sub/sub-sub origin branch.branch-a.remote &&
|
||||
test_cmp_config -C sub/sub-sub refs/heads/branch-a branch.branch-a.merge
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'should not fail when unable to set up tracking in submodule' '
|
||||
test_when_finished "reset_remote_test" &&
|
||||
(
|
||||
cd super-clone &&
|
||||
git remote rename origin ex-origin &&
|
||||
git branch --recurse-submodules branch-a ex-origin/branch-a &&
|
||||
test_cmp_config ex-origin branch.branch-a.remote &&
|
||||
test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
|
||||
test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
|
||||
test_cmp_config -C sub "" --default "" branch.branch-a.merge
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
Loading…
Reference in New Issue
Block a user