2014-02-28 06:43:33 +00:00
|
|
|
#include "git-compat-util.h"
|
2008-02-07 16:40:08 +00:00
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2008-02-07 16:40:08 +00:00
|
|
|
#include "branch.h"
|
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "remote.h"
|
|
|
|
|
#include "commit.h"
|
2015-10-02 11:55:31 +00:00
|
|
|
#include "worktree.h"
|
2008-02-07 16:40:08 +00:00
|
|
|
|
|
|
|
|
struct tracking {
|
|
|
|
|
struct refspec spec;
|
|
|
|
|
char *src;
|
|
|
|
|
const char *remote;
|
|
|
|
|
int matches;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int find_tracked_branch(struct remote *remote, void *priv)
|
|
|
|
|
{
|
|
|
|
|
struct tracking *tracking = priv;
|
|
|
|
|
|
|
|
|
|
if (!remote_find_tracking(remote, &tracking->spec)) {
|
|
|
|
|
if (++tracking->matches == 1) {
|
|
|
|
|
tracking->src = tracking->spec.src;
|
|
|
|
|
tracking->remote = remote->name;
|
|
|
|
|
} else {
|
|
|
|
|
free(tracking->spec.src);
|
|
|
|
|
if (tracking->src) {
|
2017-06-15 23:15:46 +00:00
|
|
|
FREE_AND_NULL(tracking->src);
|
2008-02-07 16:40:08 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
tracking->spec.src = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-04 06:29:55 +00:00
|
|
|
static int should_setup_rebase(const char *origin)
|
2008-05-10 22:36:29 +00:00
|
|
|
{
|
|
|
|
|
switch (autorebase) {
|
|
|
|
|
case AUTOREBASE_NEVER:
|
|
|
|
|
return 0;
|
|
|
|
|
case AUTOREBASE_LOCAL:
|
2009-03-04 06:29:55 +00:00
|
|
|
return origin == NULL;
|
2008-05-10 22:36:29 +00:00
|
|
|
case AUTOREBASE_REMOTE:
|
2009-03-04 06:29:55 +00:00
|
|
|
return origin != NULL;
|
2008-05-10 22:36:29 +00:00
|
|
|
case AUTOREBASE_ALWAYS:
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-22 11:23:23 +00:00
|
|
|
static const char tracking_advice[] =
|
|
|
|
|
N_("\n"
|
|
|
|
|
"After fixing the error cause you may try to fix up\n"
|
|
|
|
|
"the remote tracking information by invoking\n"
|
|
|
|
|
"\"git branch --set-upstream-to=%s%s%s\".");
|
|
|
|
|
|
|
|
|
|
int install_branch_config(int flag, const char *local, const char *origin, const char *remote)
|
2009-03-04 06:29:55 +00:00
|
|
|
{
|
refactor skip_prefix to return a boolean
The skip_prefix() function returns a pointer to the content
past the prefix, or NULL if the prefix was not found. While
this is nice and simple, in practice it makes it hard to use
for two reasons:
1. When you want to conditionally skip or keep the string
as-is, you have to introduce a temporary variable.
For example:
tmp = skip_prefix(buf, "foo");
if (tmp)
buf = tmp;
2. It is verbose to check the outcome in a conditional, as
you need extra parentheses to silence compiler
warnings. For example:
if ((cp = skip_prefix(buf, "foo"))
/* do something with cp */
Both of these make it harder to use for long if-chains, and
we tend to use starts_with() instead. However, the first line
of "do something" is often to then skip forward in buf past
the prefix, either using a magic constant or with an extra
strlen(3) (which is generally computed at compile time, but
means we are repeating ourselves).
This patch refactors skip_prefix() to return a simple boolean,
and to provide the pointer value as an out-parameter. If the
prefix is not found, the out-parameter is untouched. This
lets you write:
if (skip_prefix(arg, "foo ", &arg))
do_foo(arg);
else if (skip_prefix(arg, "bar ", &arg))
do_bar(arg);
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-18 19:44:19 +00:00
|
|
|
const char *shortname = NULL;
|
2009-03-04 06:29:55 +00:00
|
|
|
struct strbuf key = STRBUF_INIT;
|
|
|
|
|
int rebasing = should_setup_rebase(origin);
|
|
|
|
|
|
refactor skip_prefix to return a boolean
The skip_prefix() function returns a pointer to the content
past the prefix, or NULL if the prefix was not found. While
this is nice and simple, in practice it makes it hard to use
for two reasons:
1. When you want to conditionally skip or keep the string
as-is, you have to introduce a temporary variable.
For example:
tmp = skip_prefix(buf, "foo");
if (tmp)
buf = tmp;
2. It is verbose to check the outcome in a conditional, as
you need extra parentheses to silence compiler
warnings. For example:
if ((cp = skip_prefix(buf, "foo"))
/* do something with cp */
Both of these make it harder to use for long if-chains, and
we tend to use starts_with() instead. However, the first line
of "do something" is often to then skip forward in buf past
the prefix, either using a magic constant or with an extra
strlen(3) (which is generally computed at compile time, but
means we are repeating ourselves).
This patch refactors skip_prefix() to return a simple boolean,
and to provide the pointer value as an out-parameter. If the
prefix is not found, the out-parameter is untouched. This
lets you write:
if (skip_prefix(arg, "foo ", &arg))
do_foo(arg);
else if (skip_prefix(arg, "bar ", &arg))
do_bar(arg);
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-18 19:44:19 +00:00
|
|
|
if (skip_prefix(remote, "refs/heads/", &shortname)
|
2010-01-18 20:44:12 +00:00
|
|
|
&& !strcmp(local, shortname)
|
|
|
|
|
&& !origin) {
|
2013-04-16 03:37:50 +00:00
|
|
|
warning(_("Not setting branch %s as its own upstream."),
|
2010-01-18 20:44:12 +00:00
|
|
|
local);
|
2016-02-22 11:23:23 +00:00
|
|
|
return 0;
|
2010-01-18 20:44:12 +00:00
|
|
|
}
|
|
|
|
|
|
2009-03-04 06:29:55 +00:00
|
|
|
strbuf_addf(&key, "branch.%s.remote", local);
|
2016-02-22 11:23:35 +00:00
|
|
|
if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
|
2016-02-22 11:23:23 +00:00
|
|
|
goto out_err;
|
2009-03-04 06:29:55 +00:00
|
|
|
|
|
|
|
|
strbuf_reset(&key);
|
|
|
|
|
strbuf_addf(&key, "branch.%s.merge", local);
|
2016-02-22 11:23:35 +00:00
|
|
|
if (git_config_set_gently(key.buf, remote) < 0)
|
2016-02-22 11:23:23 +00:00
|
|
|
goto out_err;
|
2009-03-04 06:29:55 +00:00
|
|
|
|
|
|
|
|
if (rebasing) {
|
|
|
|
|
strbuf_reset(&key);
|
|
|
|
|
strbuf_addf(&key, "branch.%s.rebase", local);
|
2016-02-22 11:23:35 +00:00
|
|
|
if (git_config_set_gently(key.buf, "true") < 0)
|
2016-02-22 11:23:23 +00:00
|
|
|
goto out_err;
|
2009-03-04 06:29:55 +00:00
|
|
|
}
|
2012-06-07 12:05:10 +00:00
|
|
|
strbuf_release(&key);
|
2009-03-04 06:29:55 +00:00
|
|
|
|
2009-03-10 08:20:42 +00:00
|
|
|
if (flag & BRANCH_CONFIG_VERBOSE) {
|
2014-03-31 23:31:19 +00:00
|
|
|
if (shortname) {
|
2014-03-10 05:32:01 +00:00
|
|
|
if (origin)
|
|
|
|
|
printf_ln(rebasing ?
|
2017-08-17 02:54:25 +00:00
|
|
|
_("Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.") :
|
|
|
|
|
_("Branch '%s' set up to track remote branch '%s' from '%s'."),
|
2014-03-10 05:32:01 +00:00
|
|
|
local, shortname, origin);
|
|
|
|
|
else
|
|
|
|
|
printf_ln(rebasing ?
|
2017-08-17 02:54:25 +00:00
|
|
|
_("Branch '%s' set up to track local branch '%s' by rebasing.") :
|
|
|
|
|
_("Branch '%s' set up to track local branch '%s'."),
|
2014-03-10 05:32:01 +00:00
|
|
|
local, shortname);
|
|
|
|
|
} else {
|
|
|
|
|
if (origin)
|
|
|
|
|
printf_ln(rebasing ?
|
2017-08-17 02:54:25 +00:00
|
|
|
_("Branch '%s' set up to track remote ref '%s' by rebasing.") :
|
|
|
|
|
_("Branch '%s' set up to track remote ref '%s'."),
|
2014-03-10 05:32:01 +00:00
|
|
|
local, remote);
|
|
|
|
|
else
|
|
|
|
|
printf_ln(rebasing ?
|
2017-08-17 02:54:25 +00:00
|
|
|
_("Branch '%s' set up to track local ref '%s' by rebasing.") :
|
|
|
|
|
_("Branch '%s' set up to track local ref '%s'."),
|
2014-03-10 05:32:01 +00:00
|
|
|
local, remote);
|
|
|
|
|
}
|
2009-03-10 08:20:42 +00:00
|
|
|
}
|
2016-02-22 11:23:23 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
out_err:
|
|
|
|
|
strbuf_release(&key);
|
|
|
|
|
error(_("Unable to write upstream branch configuration"));
|
|
|
|
|
|
|
|
|
|
advise(_(tracking_advice),
|
|
|
|
|
origin ? origin : "",
|
|
|
|
|
origin ? "/" : "",
|
|
|
|
|
shortname ? shortname : remote);
|
|
|
|
|
|
|
|
|
|
return -1;
|
2009-03-04 06:29:55 +00:00
|
|
|
}
|
|
|
|
|
|
2008-02-07 16:40:08 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
2016-02-22 11:23:23 +00:00
|
|
|
static void setup_tracking(const char *new_ref, const char *orig_ref,
|
|
|
|
|
enum branch_track track, int quiet)
|
2008-02-07 16:40:08 +00:00
|
|
|
{
|
|
|
|
|
struct tracking tracking;
|
2012-03-26 23:51:01 +00:00
|
|
|
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
|
2008-02-07 16:40:08 +00:00
|
|
|
|
|
|
|
|
memset(&tracking, 0, sizeof(tracking));
|
|
|
|
|
tracking.spec.dst = (char *)orig_ref;
|
2008-02-19 16:24:37 +00:00
|
|
|
if (for_each_remote(find_tracked_branch, &tracking))
|
2016-02-22 11:23:23 +00:00
|
|
|
return;
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2008-02-19 16:24:37 +00:00
|
|
|
if (!tracking.matches)
|
|
|
|
|
switch (track) {
|
|
|
|
|
case BRANCH_TRACK_ALWAYS:
|
|
|
|
|
case BRANCH_TRACK_EXPLICIT:
|
2010-01-18 20:44:11 +00:00
|
|
|
case BRANCH_TRACK_OVERRIDE:
|
2008-02-19 16:24:37 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
2016-02-22 11:23:23 +00:00
|
|
|
return;
|
2008-02-19 16:24:37 +00:00
|
|
|
}
|
|
|
|
|
|
2008-02-07 16:40:08 +00:00
|
|
|
if (tracking.matches > 1)
|
2016-02-22 11:23:23 +00:00
|
|
|
die(_("Not tracking: ambiguous information for ref %s"),
|
|
|
|
|
orig_ref);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2016-02-22 11:23:23 +00:00
|
|
|
if (install_branch_config(config_flags, new_ref, tracking.remote,
|
|
|
|
|
tracking.src ? tracking.src : orig_ref) < 0)
|
|
|
|
|
exit(-1);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2009-03-04 06:29:55 +00:00
|
|
|
free(tracking.src);
|
2008-02-07 16:40:08 +00:00
|
|
|
}
|
|
|
|
|
|
2011-09-22 03:19:38 +00:00
|
|
|
int read_branch_desc(struct strbuf *buf, const char *branch_name)
|
|
|
|
|
{
|
2014-08-07 17:56:42 +00:00
|
|
|
char *v = NULL;
|
2011-09-22 03:19:38 +00:00
|
|
|
struct strbuf name = STRBUF_INIT;
|
|
|
|
|
strbuf_addf(&name, "branch.%s.description", branch_name);
|
2014-08-07 17:56:42 +00:00
|
|
|
if (git_config_get_string(name.buf, &v)) {
|
|
|
|
|
strbuf_release(&name);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
strbuf_addstr(buf, v);
|
|
|
|
|
free(v);
|
2011-09-22 03:19:38 +00:00
|
|
|
strbuf_release(&name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 23:28:38 +00:00
|
|
|
int validate_new_branchname(const char *name, struct strbuf *ref,
|
|
|
|
|
int force, int attr_only)
|
2011-08-20 21:49:48 +00:00
|
|
|
{
|
|
|
|
|
if (strbuf_check_branch_ref(ref, name))
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("'%s' is not a valid branch name."), name);
|
2011-08-20 21:49:48 +00:00
|
|
|
|
|
|
|
|
if (!ref_exists(ref->buf))
|
|
|
|
|
return 0;
|
2011-09-16 23:28:38 +00:00
|
|
|
else if (!force && !attr_only)
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/"));
|
2011-08-20 21:49:48 +00:00
|
|
|
|
2011-09-16 23:28:38 +00:00
|
|
|
if (!attr_only) {
|
|
|
|
|
const char *head;
|
2017-05-01 02:29:00 +00:00
|
|
|
struct object_id oid;
|
2011-08-20 21:49:48 +00:00
|
|
|
|
2017-05-01 02:29:00 +00:00
|
|
|
head = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
|
2011-09-16 23:28:38 +00:00
|
|
|
if (!is_bare_repository() && head && !strcmp(head, ref->buf))
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("Cannot force update the current branch."));
|
2011-09-16 23:28:38 +00:00
|
|
|
}
|
2011-08-20 21:49:48 +00:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
The current code for validating tracking branches (e.g. the argument to
the -t/--track option) hardcodes refs/heads/* and refs/remotes/* as the
potential locations for tracking branches. This works with the refspecs
created by "git clone" or "git remote add", but is suboptimal in other
cases:
- If "refs/remotes/foo/bar" exists without any association to a remote
(i.e. there is no remote named "foo", or no remote with a refspec
that matches "refs/remotes/foo/bar"), then it is impossible to set up
a valid upstream config that tracks it. Currently, the code defaults
to using "refs/remotes/foo/bar" from repo "." as the upstream, which
works, but is probably not what the user had in mind when running
"git branch baz --track foo/bar".
- If the user has tweaked the fetch refspec for a remote to put its
remote-tracking branches outside of refs/remotes/*, e.g. by running
git config remote.foo.fetch "+refs/heads/*:refs/foo_stuff/*"
then the current code will refuse to use its remote-tracking branches
as --track arguments, since they do not match refs/remotes/*.
This patch removes the "refs/remotes/*" requirement for upstream branches,
and replaces it with explicit checking of the refspecs for each remote to
determine whether a given --track argument is a valid remote-tracking
branch. This solves both of the above problems, since the matching refspec
guarantees that there is a both a remote name and a remote branch name
that can be used for the upstream config.
However, this means that refs located within refs/remotes/* without a
corresponding remote/refspec will no longer be usable as upstreams.
The few existing tests which depended on this behavioral quirk has
already been fixed in the preceding patches.
This patch fixes the last remaining test failure in t2024-checkout-dwim.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-21 21:52:05 +00:00
|
|
|
static int check_tracking_branch(struct remote *remote, void *cb_data)
|
|
|
|
|
{
|
|
|
|
|
char *tracking_branch = cb_data;
|
|
|
|
|
struct refspec query;
|
|
|
|
|
memset(&query, 0, sizeof(struct refspec));
|
|
|
|
|
query.dst = tracking_branch;
|
2013-09-08 20:58:15 +00:00
|
|
|
return !remote_find_tracking(remote, &query);
|
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
The current code for validating tracking branches (e.g. the argument to
the -t/--track option) hardcodes refs/heads/* and refs/remotes/* as the
potential locations for tracking branches. This works with the refspecs
created by "git clone" or "git remote add", but is suboptimal in other
cases:
- If "refs/remotes/foo/bar" exists without any association to a remote
(i.e. there is no remote named "foo", or no remote with a refspec
that matches "refs/remotes/foo/bar"), then it is impossible to set up
a valid upstream config that tracks it. Currently, the code defaults
to using "refs/remotes/foo/bar" from repo "." as the upstream, which
works, but is probably not what the user had in mind when running
"git branch baz --track foo/bar".
- If the user has tweaked the fetch refspec for a remote to put its
remote-tracking branches outside of refs/remotes/*, e.g. by running
git config remote.foo.fetch "+refs/heads/*:refs/foo_stuff/*"
then the current code will refuse to use its remote-tracking branches
as --track arguments, since they do not match refs/remotes/*.
This patch removes the "refs/remotes/*" requirement for upstream branches,
and replaces it with explicit checking of the refspecs for each remote to
determine whether a given --track argument is a valid remote-tracking
branch. This solves both of the above problems, since the matching refspec
guarantees that there is a both a remote name and a remote branch name
that can be used for the upstream config.
However, this means that refs located within refs/remotes/* without a
corresponding remote/refspec will no longer be usable as upstreams.
The few existing tests which depended on this behavioral quirk has
already been fixed in the preceding patches.
This patch fixes the last remaining test failure in t2024-checkout-dwim.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-21 21:52:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int validate_remote_tracking_branch(char *ref)
|
|
|
|
|
{
|
|
|
|
|
return !for_each_remote(check_tracking_branch, ref);
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-02 19:03:55 +00:00
|
|
|
static const char upstream_not_branch[] =
|
2013-04-02 19:04:51 +00:00
|
|
|
N_("Cannot setup tracking information; starting point '%s' is not a branch.");
|
2013-04-02 19:04:27 +00:00
|
|
|
static const char upstream_missing[] =
|
2013-04-02 19:05:12 +00:00
|
|
|
N_("the requested upstream branch '%s' does not exist");
|
|
|
|
|
static const char upstream_advice[] =
|
|
|
|
|
N_("\n"
|
|
|
|
|
"If you are planning on basing your work on an upstream\n"
|
|
|
|
|
"branch that already exists at the remote, you may need to\n"
|
|
|
|
|
"run \"git fetch\" to retrieve it.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you are planning to push out a new local branch that\n"
|
|
|
|
|
"will track its remote counterpart, you may want to use\n"
|
|
|
|
|
"\"git push -u\" to set the upstream config as you push.");
|
2013-04-02 19:03:55 +00:00
|
|
|
|
2016-11-04 16:30:12 +00:00
|
|
|
void create_branch(const char *name, const char *start_name,
|
2011-11-26 08:54:55 +00:00
|
|
|
int force, int reflog, int clobber_head,
|
2012-03-26 23:51:01 +00:00
|
|
|
int quiet, enum branch_track track)
|
2008-02-07 16:40:08 +00:00
|
|
|
{
|
|
|
|
|
struct commit *commit;
|
2017-05-01 02:29:00 +00:00
|
|
|
struct object_id oid;
|
2017-03-28 19:46:36 +00:00
|
|
|
char *real_ref;
|
2009-02-14 07:08:05 +00:00
|
|
|
struct strbuf ref = STRBUF_INIT;
|
2008-02-07 16:40:08 +00:00
|
|
|
int forcing = 0;
|
2010-01-18 20:44:11 +00:00
|
|
|
int dont_change_ref = 0;
|
|
|
|
|
int explicit_tracking = 0;
|
|
|
|
|
|
|
|
|
|
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
|
|
|
|
|
explicit_tracking = 1;
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2011-09-16 23:28:38 +00:00
|
|
|
if (validate_new_branchname(name, &ref, force,
|
2011-11-26 08:54:55 +00:00
|
|
|
track == BRANCH_TRACK_OVERRIDE ||
|
|
|
|
|
clobber_head)) {
|
2011-08-20 21:49:48 +00:00
|
|
|
if (!force)
|
2010-01-18 20:44:11 +00:00
|
|
|
dont_change_ref = 1;
|
2011-08-20 21:49:48 +00:00
|
|
|
else
|
|
|
|
|
forcing = 1;
|
2008-02-07 16:40:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
real_ref = NULL;
|
2017-05-01 02:29:00 +00:00
|
|
|
if (get_oid(start_name, &oid)) {
|
2013-04-02 19:05:12 +00:00
|
|
|
if (explicit_tracking) {
|
|
|
|
|
if (advice_set_upstream_failure) {
|
|
|
|
|
error(_(upstream_missing), start_name);
|
|
|
|
|
advise(_(upstream_advice));
|
|
|
|
|
exit(1);
|
|
|
|
|
}
|
2013-04-02 19:04:51 +00:00
|
|
|
die(_(upstream_missing), start_name);
|
2013-04-02 19:05:12 +00:00
|
|
|
}
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("Not a valid object name: '%s'."), start_name);
|
2013-04-02 19:04:27 +00:00
|
|
|
}
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2017-05-01 02:29:00 +00:00
|
|
|
switch (dwim_ref(start_name, strlen(start_name), oid.hash, &real_ref)) {
|
2008-02-07 16:40:08 +00:00
|
|
|
case 0:
|
|
|
|
|
/* Not branching from any existing branch */
|
2010-01-18 20:44:11 +00:00
|
|
|
if (explicit_tracking)
|
2013-04-02 19:04:51 +00:00
|
|
|
die(_(upstream_not_branch), start_name);
|
2008-02-07 16:40:08 +00:00
|
|
|
break;
|
|
|
|
|
case 1:
|
2011-02-16 23:12:20 +00:00
|
|
|
/* Unique completion -- good, only if it is a real branch */
|
2013-11-30 20:55:40 +00:00
|
|
|
if (!starts_with(real_ref, "refs/heads/") &&
|
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
The current code for validating tracking branches (e.g. the argument to
the -t/--track option) hardcodes refs/heads/* and refs/remotes/* as the
potential locations for tracking branches. This works with the refspecs
created by "git clone" or "git remote add", but is suboptimal in other
cases:
- If "refs/remotes/foo/bar" exists without any association to a remote
(i.e. there is no remote named "foo", or no remote with a refspec
that matches "refs/remotes/foo/bar"), then it is impossible to set up
a valid upstream config that tracks it. Currently, the code defaults
to using "refs/remotes/foo/bar" from repo "." as the upstream, which
works, but is probably not what the user had in mind when running
"git branch baz --track foo/bar".
- If the user has tweaked the fetch refspec for a remote to put its
remote-tracking branches outside of refs/remotes/*, e.g. by running
git config remote.foo.fetch "+refs/heads/*:refs/foo_stuff/*"
then the current code will refuse to use its remote-tracking branches
as --track arguments, since they do not match refs/remotes/*.
This patch removes the "refs/remotes/*" requirement for upstream branches,
and replaces it with explicit checking of the refspecs for each remote to
determine whether a given --track argument is a valid remote-tracking
branch. This solves both of the above problems, since the matching refspec
guarantees that there is a both a remote name and a remote branch name
that can be used for the upstream config.
However, this means that refs located within refs/remotes/* without a
corresponding remote/refspec will no longer be usable as upstreams.
The few existing tests which depended on this behavioral quirk has
already been fixed in the preceding patches.
This patch fixes the last remaining test failure in t2024-checkout-dwim.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-21 21:52:05 +00:00
|
|
|
validate_remote_tracking_branch(real_ref)) {
|
2011-02-16 23:12:20 +00:00
|
|
|
if (explicit_tracking)
|
2013-04-02 19:04:51 +00:00
|
|
|
die(_(upstream_not_branch), start_name);
|
2011-02-16 23:12:20 +00:00
|
|
|
else
|
|
|
|
|
real_ref = NULL;
|
|
|
|
|
}
|
2008-02-07 16:40:08 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("Ambiguous object name: '%s'."), start_name);
|
2008-02-07 16:40:08 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
Convert lookup_commit* to struct object_id
Convert lookup_commit, lookup_commit_or_die,
lookup_commit_reference, and lookup_commit_reference_gently to take
struct object_id arguments.
Introduce a temporary in parse_object buffer in order to convert this
function. This is required since in order to convert parse_object and
parse_object_buffer, lookup_commit_reference_gently and
lookup_commit_or_die would need to be converted. Not introducing a
temporary would therefore require that lookup_commit_or_die take a
struct object_id *, but lookup_commit would take unsigned char *,
leaving a confusing and hard-to-use interface.
parse_object_buffer will lose this temporary in a later patch.
This commit was created with manual changes to commit.c, commit.h, and
object.c, plus the following semantic patch:
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1.hash, E2)
+ lookup_commit_reference_gently(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1->hash, E2)
+ lookup_commit_reference_gently(E1, E2)
@@
expression E1;
@@
- lookup_commit_reference(E1.hash)
+ lookup_commit_reference(&E1)
@@
expression E1;
@@
- lookup_commit_reference(E1->hash)
+ lookup_commit_reference(E1)
@@
expression E1;
@@
- lookup_commit(E1.hash)
+ lookup_commit(&E1)
@@
expression E1;
@@
- lookup_commit(E1->hash)
+ lookup_commit(E1)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1.hash, E2)
+ lookup_commit_or_die(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1->hash, E2)
+ lookup_commit_or_die(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-06 22:10:10 +00:00
|
|
|
if ((commit = lookup_commit_reference(&oid)) == NULL)
|
2013-04-16 03:37:50 +00:00
|
|
|
die(_("Not a valid branch point: '%s'."), start_name);
|
2017-05-01 02:29:00 +00:00
|
|
|
oidcpy(&oid, &commit->object.oid);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2014-04-16 23:21:53 +00:00
|
|
|
if (reflog)
|
2017-01-27 10:09:47 +00:00
|
|
|
log_all_ref_updates = LOG_REFS_NORMAL;
|
2014-04-16 23:21:53 +00:00
|
|
|
|
|
|
|
|
if (!dont_change_ref) {
|
|
|
|
|
struct ref_transaction *transaction;
|
|
|
|
|
struct strbuf err = STRBUF_INIT;
|
2017-03-28 19:46:40 +00:00
|
|
|
char *msg;
|
2017-03-28 19:46:36 +00:00
|
|
|
|
|
|
|
|
if (forcing)
|
2017-03-28 19:46:40 +00:00
|
|
|
msg = xstrfmt("branch: Reset to %s", start_name);
|
2017-03-28 19:46:36 +00:00
|
|
|
else
|
2017-03-28 19:46:40 +00:00
|
|
|
msg = xstrfmt("branch: Created from %s", start_name);
|
2014-04-16 23:21:53 +00:00
|
|
|
|
|
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
|
if (!transaction ||
|
2015-02-17 17:00:15 +00:00
|
|
|
ref_transaction_update(transaction, ref.buf,
|
2017-05-01 02:29:00 +00:00
|
|
|
oid.hash, forcing ? NULL : null_sha1,
|
2015-02-17 17:00:15 +00:00
|
|
|
0, msg, &err) ||
|
2014-04-30 19:22:42 +00:00
|
|
|
ref_transaction_commit(transaction, &err))
|
2014-04-16 23:21:53 +00:00
|
|
|
die("%s", err.buf);
|
|
|
|
|
ref_transaction_free(transaction);
|
|
|
|
|
strbuf_release(&err);
|
2017-03-28 19:46:40 +00:00
|
|
|
free(msg);
|
2014-04-16 23:21:53 +00:00
|
|
|
}
|
|
|
|
|
|
2008-02-07 16:40:08 +00:00
|
|
|
if (real_ref && track)
|
2013-08-30 21:56:46 +00:00
|
|
|
setup_tracking(ref.buf + 11, real_ref, track, quiet);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2009-02-14 07:08:05 +00:00
|
|
|
strbuf_release(&ref);
|
2008-02-19 16:24:37 +00:00
|
|
|
free(real_ref);
|
2008-02-07 16:40:08 +00:00
|
|
|
}
|
2008-02-07 16:40:16 +00:00
|
|
|
|
|
|
|
|
void remove_branch_state(void)
|
|
|
|
|
{
|
memoize common git-path "constant" files
One of the most common uses of git_path() is to pass a
constant, like git_path("MERGE_MSG"). This has two
drawbacks:
1. The return value is a static buffer, and the lifetime
is dependent on other calls to git_path, etc.
2. There's no compile-time checking of the pathname. This
is OK for a one-off (after all, we have to spell it
correctly at least once), but many of these constant
strings appear throughout the code.
This patch introduces a series of functions to "memoize"
these strings, which are essentially globals for the
lifetime of the program. We compute the value once, take
ownership of the buffer, and return the cached value for
subsequent calls. cache.h provides a helper macro for
defining these functions as one-liners, and defines a few
common ones for global use.
Using a macro is a little bit gross, but it does nicely
document the purpose of the functions. If we need to touch
them all later (e.g., because we learned how to change the
git_dir variable at runtime, and need to invalidate all of
the stored values), it will be much easier to have the
complete list.
Note that the shared-global functions have separate, manual
declarations. We could do something clever with the macros
(e.g., expand it to a declaration in some places, and a
declaration _and_ a definition in path.c). But there aren't
that many, and it's probably better to stay away from
too-magical macros.
Likewise, if we abandon the C preprocessor in favor of
generating these with a script, we could get much fancier.
E.g., normalizing "FOO/BAR-BAZ" into "git_path_foo_bar_baz".
But the small amount of saved typing is probably not worth
the resulting confusion to readers who want to grep for the
function's definition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-10 09:38:57 +00:00
|
|
|
unlink(git_path_cherry_pick_head());
|
|
|
|
|
unlink(git_path_revert_head());
|
|
|
|
|
unlink(git_path_merge_head());
|
|
|
|
|
unlink(git_path_merge_rr());
|
|
|
|
|
unlink(git_path_merge_msg());
|
|
|
|
|
unlink(git_path_merge_mode());
|
|
|
|
|
unlink(git_path_squash_msg());
|
2008-02-07 16:40:16 +00:00
|
|
|
}
|
2015-07-17 23:00:04 +00:00
|
|
|
|
2016-04-22 13:01:33 +00:00
|
|
|
void die_if_checked_out(const char *branch, int ignore_current_worktree)
|
2015-08-10 17:52:44 +00:00
|
|
|
{
|
2016-04-22 13:01:27 +00:00
|
|
|
const struct worktree *wt;
|
2015-08-10 17:52:44 +00:00
|
|
|
|
2016-04-22 13:01:27 +00:00
|
|
|
wt = find_shared_symref("HEAD", branch);
|
2016-04-22 13:01:33 +00:00
|
|
|
if (!wt || (ignore_current_worktree && wt->is_current))
|
2016-04-22 13:01:27 +00:00
|
|
|
return;
|
|
|
|
|
skip_prefix(branch, "refs/heads/", &branch);
|
|
|
|
|
die(_("'%s' is already checked out at '%s'"),
|
|
|
|
|
branch, wt->path);
|
2015-07-17 23:00:04 +00:00
|
|
|
}
|
2016-03-27 14:37:14 +00:00
|
|
|
|
2017-02-21 01:10:35 +00:00
|
|
|
int replace_each_worktree_head_symref(const char *oldref, const char *newref,
|
|
|
|
|
const char *logmsg)
|
2016-03-27 14:37:14 +00:00
|
|
|
{
|
|
|
|
|
int ret = 0;
|
2016-11-28 09:36:55 +00:00
|
|
|
struct worktree **worktrees = get_worktrees(0);
|
2016-03-27 14:37:14 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; worktrees[i]; i++) {
|
2017-04-24 10:01:24 +00:00
|
|
|
struct ref_store *refs;
|
|
|
|
|
|
2016-03-27 14:37:14 +00:00
|
|
|
if (worktrees[i]->is_detached)
|
|
|
|
|
continue;
|
branch: fix branch renaming not updating HEADs correctly
There are two bugs that sort of work together and cause
problems. Let's start with one in replace_each_worktree_head_symref.
Before fa099d2322 (worktree.c: kill parse_ref() in favor of
refs_resolve_ref_unsafe() - 2017-04-24), this code looks like this:
if (strcmp(oldref, worktrees[i]->head_ref))
continue;
set_worktree_head_symref(...);
After fa099d2322, it is possible that head_ref can be NULL. However,
the updated code takes the wrong exit. In the error case (NULL
head_ref), we should "continue;" to the next worktree. The updated
code makes us _skip_ "continue;" and update HEAD anyway.
The NULL head_ref is triggered by the second bug in add_head_info (in
the same commit). With the flag RESOLVE_REF_READING, resolve_ref_unsafe()
will abort if it cannot resolve the target ref. For orphan checkouts,
HEAD always points to an unborned branch, resolving target ref will
always fail. Now we have NULL head_ref. Now we always update HEAD.
Correct the logic in replace_ function so that we don't accidentally
update HEAD on error. As it turns out, correcting the logic bug above
breaks branch renaming completely, thanks to the second bug.
"git branch -[Mm]" does two steps (on a normal checkout, no orphan!):
- rename the branch on disk (e.g. refs/heads/abc to refs/heads/def)
- update HEAD if it points to the branch being renamed.
At the second step, since the branch pointed to by HEAD (e.g. "abc") no
longer exists on disk, we run into a temporary orphan checkout situation
that has been just corrected to _not_ update HEAD. But we need to update
HEAD since it's not actually an orphan checkout. We need to update HEAD
to move out of that orphan state.
Correct add_head_info(), remove RESOLVE_REF_READING flag. With the flag
gone, we should always return good "head_ref" in orphan checkouts (either
temporary or permanent). With good head_ref, things start to work again.
Noticed-by: Nish Aravamudan <nish.aravamudan@canonical.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-24 10:41:24 +00:00
|
|
|
if (!worktrees[i]->head_ref)
|
|
|
|
|
continue;
|
|
|
|
|
if (strcmp(oldref, worktrees[i]->head_ref))
|
2016-03-27 14:37:14 +00:00
|
|
|
continue;
|
|
|
|
|
|
2017-04-24 10:01:24 +00:00
|
|
|
refs = get_worktree_ref_store(worktrees[i]);
|
|
|
|
|
if (refs_create_symref(refs, "HEAD", newref, logmsg))
|
|
|
|
|
ret = error(_("HEAD of working tree %s is not updated"),
|
|
|
|
|
worktrees[i]->path);
|
2016-03-27 14:37:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free_worktrees(worktrees);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|