2014-02-28 14:43:33 +08:00
|
|
|
#include "git-compat-util.h"
|
2008-02-08 00:40:08 +08:00
|
|
|
#include "cache.h"
|
|
|
|
|
#include "branch.h"
|
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "remote.h"
|
|
|
|
|
#include "commit.h"
|
|
|
|
|
|
|
|
|
|
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) {
|
|
|
|
|
free(tracking->src);
|
|
|
|
|
tracking->src = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
tracking->spec.src = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-04 14:29:55 +08:00
|
|
|
static int should_setup_rebase(const char *origin)
|
2008-05-11 06:36:29 +08:00
|
|
|
{
|
|
|
|
|
switch (autorebase) {
|
|
|
|
|
case AUTOREBASE_NEVER:
|
|
|
|
|
return 0;
|
|
|
|
|
case AUTOREBASE_LOCAL:
|
2009-03-04 14:29:55 +08:00
|
|
|
return origin == NULL;
|
2008-05-11 06:36:29 +08:00
|
|
|
case AUTOREBASE_REMOTE:
|
2009-03-04 14:29:55 +08:00
|
|
|
return origin != NULL;
|
2008-05-11 06:36:29 +08:00
|
|
|
case AUTOREBASE_ALWAYS:
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-04 14:29:55 +08:00
|
|
|
void install_branch_config(int flag, const char *local, const char *origin, const char *remote)
|
|
|
|
|
{
|
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-19 03:44:19 +08:00
|
|
|
const char *shortname = NULL;
|
2009-03-04 14:29:55 +08: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-19 03:44:19 +08:00
|
|
|
if (skip_prefix(remote, "refs/heads/", &shortname)
|
2010-01-19 04:44:12 +08:00
|
|
|
&& !strcmp(local, shortname)
|
|
|
|
|
&& !origin) {
|
2013-04-16 11:37:50 +08:00
|
|
|
warning(_("Not setting branch %s as its own upstream."),
|
2010-01-19 04:44:12 +08:00
|
|
|
local);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-04 14:29:55 +08:00
|
|
|
strbuf_addf(&key, "branch.%s.remote", local);
|
|
|
|
|
git_config_set(key.buf, origin ? origin : ".");
|
|
|
|
|
|
|
|
|
|
strbuf_reset(&key);
|
|
|
|
|
strbuf_addf(&key, "branch.%s.merge", local);
|
|
|
|
|
git_config_set(key.buf, remote);
|
|
|
|
|
|
|
|
|
|
if (rebasing) {
|
|
|
|
|
strbuf_reset(&key);
|
|
|
|
|
strbuf_addf(&key, "branch.%s.rebase", local);
|
|
|
|
|
git_config_set(key.buf, "true");
|
|
|
|
|
}
|
2012-06-07 20:05:10 +08:00
|
|
|
strbuf_release(&key);
|
2009-03-04 14:29:55 +08:00
|
|
|
|
2009-03-10 16:20:42 +08:00
|
|
|
if (flag & BRANCH_CONFIG_VERBOSE) {
|
2014-04-01 07:31:19 +08:00
|
|
|
if (shortname) {
|
2014-03-10 13:32:01 +08:00
|
|
|
if (origin)
|
|
|
|
|
printf_ln(rebasing ?
|
|
|
|
|
_("Branch %s set up to track remote branch %s from %s by rebasing.") :
|
|
|
|
|
_("Branch %s set up to track remote branch %s from %s."),
|
|
|
|
|
local, shortname, origin);
|
|
|
|
|
else
|
|
|
|
|
printf_ln(rebasing ?
|
|
|
|
|
_("Branch %s set up to track local branch %s by rebasing.") :
|
|
|
|
|
_("Branch %s set up to track local branch %s."),
|
|
|
|
|
local, shortname);
|
|
|
|
|
} else {
|
|
|
|
|
if (origin)
|
|
|
|
|
printf_ln(rebasing ?
|
|
|
|
|
_("Branch %s set up to track remote ref %s by rebasing.") :
|
|
|
|
|
_("Branch %s set up to track remote ref %s."),
|
|
|
|
|
local, remote);
|
|
|
|
|
else
|
|
|
|
|
printf_ln(rebasing ?
|
|
|
|
|
_("Branch %s set up to track local ref %s by rebasing.") :
|
|
|
|
|
_("Branch %s set up to track local ref %s."),
|
|
|
|
|
local, remote);
|
|
|
|
|
}
|
2009-03-10 16:20:42 +08:00
|
|
|
}
|
2009-03-04 14:29:55 +08:00
|
|
|
}
|
|
|
|
|
|
2008-02-08 00:40:08 +08: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.
|
|
|
|
|
*/
|
2008-02-20 00:24:37 +08:00
|
|
|
static int setup_tracking(const char *new_ref, const char *orig_ref,
|
2012-03-27 07:51:01 +08:00
|
|
|
enum branch_track track, int quiet)
|
2008-02-08 00:40:08 +08:00
|
|
|
{
|
|
|
|
|
struct tracking tracking;
|
2012-03-27 07:51:01 +08:00
|
|
|
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
|
2008-02-08 00:40:08 +08:00
|
|
|
|
|
|
|
|
memset(&tracking, 0, sizeof(tracking));
|
|
|
|
|
tracking.spec.dst = (char *)orig_ref;
|
2008-02-20 00:24:37 +08:00
|
|
|
if (for_each_remote(find_tracked_branch, &tracking))
|
2008-02-08 00:40:08 +08:00
|
|
|
return 1;
|
|
|
|
|
|
2008-02-20 00:24:37 +08:00
|
|
|
if (!tracking.matches)
|
|
|
|
|
switch (track) {
|
|
|
|
|
case BRANCH_TRACK_ALWAYS:
|
|
|
|
|
case BRANCH_TRACK_EXPLICIT:
|
2010-01-19 04:44:11 +08:00
|
|
|
case BRANCH_TRACK_OVERRIDE:
|
2008-02-20 00:24:37 +08:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-08 00:40:08 +08:00
|
|
|
if (tracking.matches > 1)
|
2013-04-16 11:37:50 +08:00
|
|
|
return error(_("Not tracking: ambiguous information for ref %s"),
|
2008-02-08 00:40:08 +08:00
|
|
|
orig_ref);
|
|
|
|
|
|
2012-03-27 07:51:01 +08:00
|
|
|
install_branch_config(config_flags, new_ref, tracking.remote,
|
2009-03-04 14:29:55 +08:00
|
|
|
tracking.src ? tracking.src : orig_ref);
|
2008-02-08 00:40:08 +08:00
|
|
|
|
2009-03-04 14:29:55 +08:00
|
|
|
free(tracking.src);
|
2008-02-08 00:40:08 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-22 11:19:38 +08:00
|
|
|
struct branch_desc_cb {
|
|
|
|
|
const char *config_name;
|
|
|
|
|
const char *value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int read_branch_desc_cb(const char *var, const char *value, void *cb)
|
|
|
|
|
{
|
|
|
|
|
struct branch_desc_cb *desc = cb;
|
|
|
|
|
if (strcmp(desc->config_name, var))
|
|
|
|
|
return 0;
|
|
|
|
|
free((char *)desc->value);
|
|
|
|
|
return git_config_string(&desc->value, var, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int read_branch_desc(struct strbuf *buf, const char *branch_name)
|
|
|
|
|
{
|
|
|
|
|
struct branch_desc_cb cb;
|
|
|
|
|
struct strbuf name = STRBUF_INIT;
|
|
|
|
|
strbuf_addf(&name, "branch.%s.description", branch_name);
|
|
|
|
|
cb.config_name = name.buf;
|
|
|
|
|
cb.value = NULL;
|
|
|
|
|
if (git_config(read_branch_desc_cb, &cb) < 0) {
|
|
|
|
|
strbuf_release(&name);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (cb.value)
|
|
|
|
|
strbuf_addstr(buf, cb.value);
|
|
|
|
|
strbuf_release(&name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-17 07:28:38 +08:00
|
|
|
int validate_new_branchname(const char *name, struct strbuf *ref,
|
|
|
|
|
int force, int attr_only)
|
2011-08-21 05:49:48 +08:00
|
|
|
{
|
|
|
|
|
if (strbuf_check_branch_ref(ref, name))
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("'%s' is not a valid branch name."), name);
|
2011-08-21 05:49:48 +08:00
|
|
|
|
|
|
|
|
if (!ref_exists(ref->buf))
|
|
|
|
|
return 0;
|
2011-09-17 07:28:38 +08:00
|
|
|
else if (!force && !attr_only)
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/"));
|
2011-08-21 05:49:48 +08:00
|
|
|
|
2011-09-17 07:28:38 +08:00
|
|
|
if (!attr_only) {
|
|
|
|
|
const char *head;
|
|
|
|
|
unsigned char sha1[20];
|
2011-08-21 05:49:48 +08:00
|
|
|
|
2011-12-12 19:20:32 +08:00
|
|
|
head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
|
2011-09-17 07:28:38 +08:00
|
|
|
if (!is_bare_repository() && head && !strcmp(head, ref->buf))
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("Cannot force update the current branch."));
|
2011-09-17 07:28:38 +08:00
|
|
|
}
|
2011-08-21 05:49:48 +08: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-22 05:52:05 +08: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-09 04:58:15 +08: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-22 05:52:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int validate_remote_tracking_branch(char *ref)
|
|
|
|
|
{
|
|
|
|
|
return !for_each_remote(check_tracking_branch, ref);
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-03 03:03:55 +08:00
|
|
|
static const char upstream_not_branch[] =
|
2013-04-03 03:04:51 +08:00
|
|
|
N_("Cannot setup tracking information; starting point '%s' is not a branch.");
|
2013-04-03 03:04:27 +08:00
|
|
|
static const char upstream_missing[] =
|
2013-04-03 03:05:12 +08: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-03 03:03:55 +08:00
|
|
|
|
2008-02-08 00:40:08 +08:00
|
|
|
void create_branch(const char *head,
|
|
|
|
|
const char *name, const char *start_name,
|
2011-11-26 16:54:55 +08:00
|
|
|
int force, int reflog, int clobber_head,
|
2012-03-27 07:51:01 +08:00
|
|
|
int quiet, enum branch_track track)
|
2008-02-08 00:40:08 +08:00
|
|
|
{
|
2010-01-19 04:44:11 +08:00
|
|
|
struct ref_lock *lock = NULL;
|
2008-02-08 00:40:08 +08:00
|
|
|
struct commit *commit;
|
|
|
|
|
unsigned char sha1[20];
|
2009-02-14 15:08:05 +08:00
|
|
|
char *real_ref, msg[PATH_MAX + 20];
|
|
|
|
|
struct strbuf ref = STRBUF_INIT;
|
2008-02-08 00:40:08 +08:00
|
|
|
int forcing = 0;
|
2010-01-19 04:44:11 +08:00
|
|
|
int dont_change_ref = 0;
|
|
|
|
|
int explicit_tracking = 0;
|
|
|
|
|
|
|
|
|
|
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
|
|
|
|
|
explicit_tracking = 1;
|
2008-02-08 00:40:08 +08:00
|
|
|
|
2011-09-17 07:28:38 +08:00
|
|
|
if (validate_new_branchname(name, &ref, force,
|
2011-11-26 16:54:55 +08:00
|
|
|
track == BRANCH_TRACK_OVERRIDE ||
|
|
|
|
|
clobber_head)) {
|
2011-08-21 05:49:48 +08:00
|
|
|
if (!force)
|
2010-01-19 04:44:11 +08:00
|
|
|
dont_change_ref = 1;
|
2011-08-21 05:49:48 +08:00
|
|
|
else
|
|
|
|
|
forcing = 1;
|
2008-02-08 00:40:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
real_ref = NULL;
|
2013-04-03 03:04:27 +08:00
|
|
|
if (get_sha1(start_name, sha1)) {
|
2013-04-03 03:05:12 +08:00
|
|
|
if (explicit_tracking) {
|
|
|
|
|
if (advice_set_upstream_failure) {
|
|
|
|
|
error(_(upstream_missing), start_name);
|
|
|
|
|
advise(_(upstream_advice));
|
|
|
|
|
exit(1);
|
|
|
|
|
}
|
2013-04-03 03:04:51 +08:00
|
|
|
die(_(upstream_missing), start_name);
|
2013-04-03 03:05:12 +08:00
|
|
|
}
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("Not a valid object name: '%s'."), start_name);
|
2013-04-03 03:04:27 +08:00
|
|
|
}
|
2008-02-08 00:40:08 +08:00
|
|
|
|
|
|
|
|
switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
|
|
|
|
|
case 0:
|
|
|
|
|
/* Not branching from any existing branch */
|
2010-01-19 04:44:11 +08:00
|
|
|
if (explicit_tracking)
|
2013-04-03 03:04:51 +08:00
|
|
|
die(_(upstream_not_branch), start_name);
|
2008-02-08 00:40:08 +08:00
|
|
|
break;
|
|
|
|
|
case 1:
|
2011-02-17 07:12:20 +08:00
|
|
|
/* Unique completion -- good, only if it is a real branch */
|
2013-12-01 04:55:40 +08: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-22 05:52:05 +08:00
|
|
|
validate_remote_tracking_branch(real_ref)) {
|
2011-02-17 07:12:20 +08:00
|
|
|
if (explicit_tracking)
|
2013-04-03 03:04:51 +08:00
|
|
|
die(_(upstream_not_branch), start_name);
|
2011-02-17 07:12:20 +08:00
|
|
|
else
|
|
|
|
|
real_ref = NULL;
|
|
|
|
|
}
|
2008-02-08 00:40:08 +08:00
|
|
|
break;
|
|
|
|
|
default:
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("Ambiguous object name: '%s'."), start_name);
|
2008-02-08 00:40:08 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((commit = lookup_commit_reference(sha1)) == NULL)
|
2013-04-16 11:37:50 +08:00
|
|
|
die(_("Not a valid branch point: '%s'."), start_name);
|
2008-02-08 00:40:08 +08:00
|
|
|
hashcpy(sha1, commit->object.sha1);
|
|
|
|
|
|
2010-01-19 04:44:11 +08:00
|
|
|
if (!dont_change_ref) {
|
2013-08-31 02:12:00 +08:00
|
|
|
lock = lock_any_ref_for_update(ref.buf, NULL, 0, NULL);
|
2010-01-19 04:44:11 +08:00
|
|
|
if (!lock)
|
2013-04-16 11:37:50 +08:00
|
|
|
die_errno(_("Failed to lock ref for update"));
|
2010-01-19 04:44:11 +08:00
|
|
|
}
|
2008-02-08 00:40:08 +08:00
|
|
|
|
|
|
|
|
if (reflog)
|
|
|
|
|
log_all_ref_updates = 1;
|
|
|
|
|
|
|
|
|
|
if (forcing)
|
2010-04-10 11:42:10 +08:00
|
|
|
snprintf(msg, sizeof msg, "branch: Reset to %s",
|
2008-02-08 00:40:08 +08:00
|
|
|
start_name);
|
2010-01-19 04:44:11 +08:00
|
|
|
else if (!dont_change_ref)
|
2008-02-08 00:40:08 +08:00
|
|
|
snprintf(msg, sizeof msg, "branch: Created from %s",
|
|
|
|
|
start_name);
|
|
|
|
|
|
|
|
|
|
if (real_ref && track)
|
2013-08-31 05:56:46 +08:00
|
|
|
setup_tracking(ref.buf + 11, real_ref, track, quiet);
|
2008-02-08 00:40:08 +08:00
|
|
|
|
2010-01-19 04:44:11 +08:00
|
|
|
if (!dont_change_ref)
|
|
|
|
|
if (write_ref_sha1(lock, sha1, msg) < 0)
|
2013-04-16 11:37:50 +08:00
|
|
|
die_errno(_("Failed to write ref"));
|
2008-02-08 00:40:08 +08:00
|
|
|
|
2009-02-14 15:08:05 +08:00
|
|
|
strbuf_release(&ref);
|
2008-02-20 00:24:37 +08:00
|
|
|
free(real_ref);
|
2008-02-08 00:40:08 +08:00
|
|
|
}
|
2008-02-08 00:40:16 +08:00
|
|
|
|
|
|
|
|
void remove_branch_state(void)
|
|
|
|
|
{
|
2011-02-20 12:12:27 +08:00
|
|
|
unlink(git_path("CHERRY_PICK_HEAD"));
|
2011-11-22 19:17:36 +08:00
|
|
|
unlink(git_path("REVERT_HEAD"));
|
2008-02-08 00:40:16 +08:00
|
|
|
unlink(git_path("MERGE_HEAD"));
|
2008-07-12 22:56:19 +08:00
|
|
|
unlink(git_path("MERGE_RR"));
|
2008-02-08 00:40:16 +08:00
|
|
|
unlink(git_path("MERGE_MSG"));
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 20:04:47 +08:00
|
|
|
unlink(git_path("MERGE_MODE"));
|
2008-02-08 00:40:16 +08:00
|
|
|
unlink(git_path("SQUASH_MSG"));
|
|
|
|
|
}
|
