mirror of
https://github.com/git/git.git
synced 2024-05-13 08:46:09 +02:00
961b130d20
To improve the submodules UX, we would like to teach Git to handle
branches in submodules. Start this process by teaching "git branch" the
--recurse-submodules option so that "git branch --recurse-submodules
topic" will create the `topic` branch in the superproject and its
submodules.
Although this commit does not introduce breaking changes, it does not
work well with existing --recurse-submodules commands because "git
branch --recurse-submodules" writes to the submodule ref store, but most
commands only consider the superproject gitlink and ignore the submodule
ref store. For example, "git checkout --recurse-submodules" will check
out the commits in the superproject gitlinks (and put the submodules in
detached HEAD) instead of checking out the submodule branches.
Because of this, this commit introduces a new configuration value,
`submodule.propagateBranches`. The plan is for Git commands to
prioritize submodule ref store information over superproject gitlinks if
this value is true. Because "git branch --recurse-submodules" writes to
submodule ref stores, for the sake of clarity, it will not function
unless this configuration value is set.
This commit also includes changes that support working with submodules
from a superproject commit because "branch --recurse-submodules" (and
future commands) need to read .gitmodules and gitlinks from the
superproject commit, but submodules are typically read from the
filesystem's .gitmodules and the index's gitlinks. These changes are:
* add a submodules_of_tree() helper that gives the relevant
information of an in-tree submodule (e.g. path and oid) and
initializes the repository
* add is_tree_submodule_active() by adding a treeish_name parameter to
is_submodule_active()
* add the "submoduleNotUpdated" advice to advise users to update the
submodules in their trees
Incidentally, fix an incorrect usage string that combined the 'list'
usage of git branch (-l) with the 'create' usage; this string has been
incorrect since its inception, a8dfd5eac4 (Make builtin-branch.c use
parse_options., 2007-10-07).
Helped-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Glen Choo <chooglen@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
133 lines
5.3 KiB
Plaintext
133 lines
5.3 KiB
Plaintext
advice.*::
|
|
These variables control various optional help messages designed to
|
|
aid new users. All 'advice.*' variables default to 'true', and you
|
|
can tell Git that you do not need help by setting these to 'false':
|
|
+
|
|
--
|
|
fetchShowForcedUpdates::
|
|
Advice shown when linkgit:git-fetch[1] takes a long time
|
|
to calculate forced updates after ref updates, or to warn
|
|
that the check is disabled.
|
|
pushUpdateRejected::
|
|
Set this variable to 'false' if you want to disable
|
|
'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists',
|
|
'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
|
|
simultaneously.
|
|
pushNonFFCurrent::
|
|
Advice shown when linkgit:git-push[1] fails due to a
|
|
non-fast-forward update to the current branch.
|
|
pushNonFFMatching::
|
|
Advice shown when you ran linkgit:git-push[1] and pushed
|
|
'matching refs' explicitly (i.e. you used ':', or
|
|
specified a refspec that isn't your current branch) and
|
|
it resulted in a non-fast-forward error.
|
|
pushAlreadyExists::
|
|
Shown when linkgit:git-push[1] rejects an update that
|
|
does not qualify for fast-forwarding (e.g., a tag.)
|
|
pushFetchFirst::
|
|
Shown when linkgit:git-push[1] rejects an update that
|
|
tries to overwrite a remote ref that points at an
|
|
object we do not have.
|
|
pushNeedsForce::
|
|
Shown when linkgit:git-push[1] rejects an update that
|
|
tries to overwrite a remote ref that points at an
|
|
object that is not a commit-ish, or make the remote
|
|
ref point at an object that is not a commit-ish.
|
|
pushUnqualifiedRefname::
|
|
Shown when linkgit:git-push[1] gives up trying to
|
|
guess based on the source and destination refs what
|
|
remote ref namespace the source belongs in, but where
|
|
we can still suggest that the user push to either
|
|
refs/heads/* or refs/tags/* based on the type of the
|
|
source object.
|
|
pushRefNeedsUpdate::
|
|
Shown when linkgit:git-push[1] rejects a forced update of
|
|
a branch when its remote-tracking ref has updates that we
|
|
do not have locally.
|
|
skippedCherryPicks::
|
|
Shown when linkgit:git-rebase[1] skips a commit that has already
|
|
been cherry-picked onto the upstream branch.
|
|
statusAheadBehind::
|
|
Shown when linkgit:git-status[1] computes the ahead/behind
|
|
counts for a local ref compared to its remote tracking ref,
|
|
and that calculation takes longer than expected. Will not
|
|
appear if `status.aheadBehind` is false or the option
|
|
`--no-ahead-behind` is given.
|
|
statusHints::
|
|
Show directions on how to proceed from the current
|
|
state in the output of linkgit:git-status[1], in
|
|
the template shown when writing commit messages in
|
|
linkgit:git-commit[1], and in the help message shown
|
|
by linkgit:git-switch[1] or
|
|
linkgit:git-checkout[1] when switching branch.
|
|
statusUoption::
|
|
Advise to consider using the `-u` option to linkgit:git-status[1]
|
|
when the command takes more than 2 seconds to enumerate untracked
|
|
files.
|
|
commitBeforeMerge::
|
|
Advice shown when linkgit:git-merge[1] refuses to
|
|
merge to avoid overwriting local changes.
|
|
resetQuiet::
|
|
Advice to consider using the `--quiet` option to linkgit:git-reset[1]
|
|
when the command takes more than 2 seconds to enumerate unstaged
|
|
changes after reset.
|
|
resolveConflict::
|
|
Advice shown by various commands when conflicts
|
|
prevent the operation from being performed.
|
|
sequencerInUse::
|
|
Advice shown when a sequencer command is already in progress.
|
|
implicitIdentity::
|
|
Advice on how to set your identity configuration when
|
|
your information is guessed from the system username and
|
|
domain name.
|
|
detachedHead::
|
|
Advice shown when you used
|
|
linkgit:git-switch[1] or linkgit:git-checkout[1]
|
|
to move to the detach HEAD state, to instruct how to
|
|
create a local branch after the fact.
|
|
checkoutAmbiguousRemoteBranchName::
|
|
Advice shown when the argument to
|
|
linkgit:git-checkout[1] and linkgit:git-switch[1]
|
|
ambiguously resolves to a
|
|
remote tracking branch on more than one remote in
|
|
situations where an unambiguous argument would have
|
|
otherwise caused a remote-tracking branch to be
|
|
checked out. See the `checkout.defaultRemote`
|
|
configuration variable for how to set a given remote
|
|
to used by default in some situations where this
|
|
advice would be printed.
|
|
amWorkDir::
|
|
Advice that shows the location of the patch file when
|
|
linkgit:git-am[1] fails to apply it.
|
|
rmHints::
|
|
In case of failure in the output of linkgit:git-rm[1],
|
|
show directions on how to proceed from the current state.
|
|
addEmbeddedRepo::
|
|
Advice on what to do when you've accidentally added one
|
|
git repo inside of another.
|
|
ignoredHook::
|
|
Advice shown if a hook is ignored because the hook is not
|
|
set as executable.
|
|
waitingForEditor::
|
|
Print a message to the terminal whenever Git is waiting for
|
|
editor input from the user.
|
|
nestedTag::
|
|
Advice shown if a user attempts to recursively tag a tag object.
|
|
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.
|
|
addEmptyPathspec::
|
|
Advice shown if a user runs the add command without providing
|
|
the pathspec parameter.
|
|
updateSparsePath::
|
|
Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
|
|
is asked to update index entries outside the current sparse
|
|
checkout.
|
|
--
|