delta/git.git/branch.h, branch nd/fetch-pack-error-reporting-fix

checkout: suppress tracking message with "-q"

2012-03-27T04:32:43+00:00

Like the "switched to..." message (which is already
suppressed by "-q"), this message is purely informational.
Let's silence it if the user asked us to be quiet.

This patch is slightly more than a one-liner, because we
have to teach create_branch to propagate the flag all the
way down to install_branch_config.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Merge branch 'jn/branch-move-to-self'

2011-12-14T06:53:08+00:00

* jn/branch-move-to-self:
  Allow checkout -B  to update the current branch
  branch: allow a no-op "branch -M  HEAD"

Allow checkout -B to update the current branch

2011-11-28T19:40:46+00:00

When on master, "git checkout -B master " is a more natural way to
say "git reset --keep ", which was originally invented for the
exact purpose of moving to the named commit while keeping the local changes
around.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

branch: add read_branch_desc() helper function

2011-10-05T21:48:39+00:00

This will be used by various callers that make use of the branch
description throughout the system, so that if we need to update
the implementation the callers do not have to be modified.

Signed-off-by: Junio C Hamano

branch --set-upstream: regression fix

2011-09-17T04:47:47+00:00

The "git branch" command, while not in listing mode, calls create_branch()
even when the target branch already exists, and it does so even when it is
not interested in updating the value of the branch (i.e. the name of the
commit object that sits at the tip of the existing branch). This happens
when the command is run with "--set-upstream" option.

The earlier safety-measure to prevent "git branch -f $branch $commit" from
updating the currently checked out branch did not take it into account,
and we no longer can update the tracking information of the current branch.

Minimally fix this regression by telling the validation code if it is
called to really update the value of a potentially existing branch, or if
the caller merely is interested in updating auxiliary aspects of a branch.

Reported-and-Tested-by: Jay Soffian
Signed-off-by: Junio C Hamano

Prevent force-updating of the current branch

2011-08-22T23:00:36+00:00

"git branch -M  " allows updating the current branch
which HEAD points, without the necessary house-keeping that git reset
normally does to make this operation sensible. It also leaves the reflog
in a confusing state (you would be warned when trying to read it).

"git checkout -B  " is also partly vulnerable to this
bug; due to inconsistent pre-flight checks it would perform half of its
task and then abort just before rewriting the branch. Again this
manifested itself as the index file getting out-of-sync with HEAD.

"git branch -f" already guarded against this problem, and aborts with
a fatal error.

Update "git branch -M", "git checkout -B" and "git branch -f" to share the
same check before allowing a branch to be created. These prevent you from
updating the current branch.

We considered suggesting the use of "git reset" in the failure message
but concluded that it was not possible to discern what the user was
actually trying to do.

Signed-off-by: Conrad Irwin 
Signed-off-by: Junio C Hamano

Change incorrect "remote branch" to "remote tracking branch" in C code

2010-11-03T16:20:47+00:00

(Just like we did for documentation already)

In the process, we change "non-remote branch" to "branch outside the
refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch".
The new formulation actually corresponds to how the code detects this
case (i.e. prefixcmp(refname, "refs/remotes")).

Also, we use 'remote-tracking branch' in generated merge messages (by
merge an fmt-merge-msg).

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Make git-clone respect branch.autosetuprebase

2009-03-04T06:58:52+00:00

When git-clone creates an initial branch it was not checking the
branch.autosetuprebase configuration option (which may exist in
~/.gitconfig).  Refactor the code used by "git branch" to create
a new branch, and use it instead of the insufficiently duplicated code
in builtin-clone.

Changes are partly, and the test is mostly, based on the previous work by
Pat Notz.

Signed-off-by: Junio C Hamano

branch: optionally setup branch.*.merge from upstream local branches

2008-02-20T05:17:45+00:00

"git branch" and "git checkout -b" now honor --track option even when
the upstream branch is local.  Previously --track was silently ignored
when forking from a local branch.  Also the command did not error out
when --track was explicitly asked for but the forked point specified
was not an existing branch (i.e. when there is no way to set up the
tracking configuration), but now it correctly does.

The configuration setting branch.autosetupmerge can now be set to
"always", which is equivalent to using --track from the command line.
Setting branch.autosetupmerge to "true" will retain the former behavior
of only setting up branch.*.merge for remote upstream branches.

Includes test cases for the new functionality.

Signed-off-by: Jay Soffian 
Signed-off-by: Junio C Hamano

Move code to clean up after a branch change to branch.c

2008-02-10T07:16:51+00:00

Signed-off-by: Daniel Barkalow