mirror of
https://github.com/git/git.git
synced 2024-05-08 07:26:07 +02:00
Merge branch 'sk/force-if-includes'
"git push --force-with-lease[=<ref>]" can easily be misused to lose commits unless the user takes good care of their own "git fetch". A new option "--force-if-includes" attempts to ensure that what is being force-pushed was created after examining the commit at the tip of the remote ref that is about to be force-replaced. * sk/force-if-includes: t, doc: update tests, reference for "--force-if-includes" push: parse and set flag for "--force-if-includes" push: add reflog check for "--force-if-includes"
This commit is contained in:
commit
de0a7effc8
|
@ -10,9 +10,8 @@ advice.*::
|
||||||
that the check is disabled.
|
that the check is disabled.
|
||||||
pushUpdateRejected::
|
pushUpdateRejected::
|
||||||
Set this variable to 'false' if you want to disable
|
Set this variable to 'false' if you want to disable
|
||||||
'pushNonFFCurrent',
|
'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists',
|
||||||
'pushNonFFMatching', 'pushAlreadyExists',
|
'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
|
||||||
'pushFetchFirst', and 'pushNeedsForce'
|
|
||||||
simultaneously.
|
simultaneously.
|
||||||
pushNonFFCurrent::
|
pushNonFFCurrent::
|
||||||
Advice shown when linkgit:git-push[1] fails due to a
|
Advice shown when linkgit:git-push[1] fails due to a
|
||||||
|
@ -41,6 +40,10 @@ advice.*::
|
||||||
we can still suggest that the user push to either
|
we can still suggest that the user push to either
|
||||||
refs/heads/* or refs/tags/* based on the type of the
|
refs/heads/* or refs/tags/* based on the type of the
|
||||||
source object.
|
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.
|
||||||
statusAheadBehind::
|
statusAheadBehind::
|
||||||
Shown when linkgit:git-status[1] computes the ahead/behind
|
Shown when linkgit:git-status[1] computes the ahead/behind
|
||||||
counts for a local ref compared to its remote tracking ref,
|
counts for a local ref compared to its remote tracking ref,
|
||||||
|
|
|
@ -114,3 +114,9 @@ push.recurseSubmodules::
|
||||||
specifying '--recurse-submodules=check|on-demand|no'.
|
specifying '--recurse-submodules=check|on-demand|no'.
|
||||||
If not set, 'no' is used by default, unless 'submodule.recurse' is
|
If not set, 'no' is used by default, unless 'submodule.recurse' is
|
||||||
set (in which case a 'true' value means 'on-demand').
|
set (in which case a 'true' value means 'on-demand').
|
||||||
|
|
||||||
|
push.useForceIfIncludes::
|
||||||
|
If set to "true", it is equivalent to specifying
|
||||||
|
`--force-if-includes` as an option to linkgit:git-push[1]
|
||||||
|
in the command line. Adding `--no-force-if-includes` at the
|
||||||
|
time of push overrides this configuration setting.
|
||||||
|
|
|
@ -13,7 +13,7 @@ SYNOPSIS
|
||||||
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
|
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
|
||||||
[-u | --set-upstream] [-o <string> | --push-option=<string>]
|
[-u | --set-upstream] [-o <string> | --push-option=<string>]
|
||||||
[--[no-]signed|--signed=(true|false|if-asked)]
|
[--[no-]signed|--signed=(true|false|if-asked)]
|
||||||
[--force-with-lease[=<refname>[:<expect>]]]
|
[--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
|
||||||
[--no-verify] [<repository> [<refspec>...]]
|
[--no-verify] [<repository> [<refspec>...]]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
@ -320,6 +320,14 @@ seen and are willing to overwrite, then rewrite history, and finally
|
||||||
force push changes to `master` if the remote version is still at
|
force push changes to `master` if the remote version is still at
|
||||||
`base`, regardless of what your local `remotes/origin/master` has been
|
`base`, regardless of what your local `remotes/origin/master` has been
|
||||||
updated to in the background.
|
updated to in the background.
|
||||||
|
+
|
||||||
|
Alternatively, specifying `--force-if-includes` as an ancillary option
|
||||||
|
along with `--force-with-lease[=<refname>]` (i.e., without saying what
|
||||||
|
exact commit the ref on the remote side must be pointing at, or which
|
||||||
|
refs on the remote side are being protected) at the time of "push" will
|
||||||
|
verify if updates from the remote-tracking refs that may have been
|
||||||
|
implicitly updated in the background are integrated locally before
|
||||||
|
allowing a forced update.
|
||||||
|
|
||||||
-f::
|
-f::
|
||||||
--force::
|
--force::
|
||||||
|
@ -341,6 +349,22 @@ one branch, use a `+` in front of the refspec to push (e.g `git push
|
||||||
origin +master` to force a push to the `master` branch). See the
|
origin +master` to force a push to the `master` branch). See the
|
||||||
`<refspec>...` section above for details.
|
`<refspec>...` section above for details.
|
||||||
|
|
||||||
|
--[no-]force-if-includes::
|
||||||
|
Force an update only if the tip of the remote-tracking ref
|
||||||
|
has been integrated locally.
|
||||||
|
+
|
||||||
|
This option enables a check that verifies if the tip of the
|
||||||
|
remote-tracking ref is reachable from one of the "reflog" entries of
|
||||||
|
the local branch based in it for a rewrite. The check ensures that any
|
||||||
|
updates from the remote have been incorporated locally by rejecting the
|
||||||
|
forced update if that is not the case.
|
||||||
|
+
|
||||||
|
If the option is passed without specifying `--force-with-lease`, or
|
||||||
|
specified along with `--force-with-lease=<refname>:<expect>`, it is
|
||||||
|
a "no-op".
|
||||||
|
+
|
||||||
|
Specifying `--no-force-if-includes` disables this behavior.
|
||||||
|
|
||||||
--repo=<repository>::
|
--repo=<repository>::
|
||||||
This option is equivalent to the <repository> argument. If both
|
This option is equivalent to the <repository> argument. If both
|
||||||
are specified, the command-line argument takes precedence.
|
are specified, the command-line argument takes precedence.
|
||||||
|
|
3
advice.c
3
advice.c
|
@ -11,6 +11,7 @@ int advice_push_already_exists = 1;
|
||||||
int advice_push_fetch_first = 1;
|
int advice_push_fetch_first = 1;
|
||||||
int advice_push_needs_force = 1;
|
int advice_push_needs_force = 1;
|
||||||
int advice_push_unqualified_ref_name = 1;
|
int advice_push_unqualified_ref_name = 1;
|
||||||
|
int advice_push_ref_needs_update = 1;
|
||||||
int advice_status_hints = 1;
|
int advice_status_hints = 1;
|
||||||
int advice_status_u_option = 1;
|
int advice_status_u_option = 1;
|
||||||
int advice_status_ahead_behind_warning = 1;
|
int advice_status_ahead_behind_warning = 1;
|
||||||
|
@ -72,6 +73,7 @@ static struct {
|
||||||
{ "pushFetchFirst", &advice_push_fetch_first },
|
{ "pushFetchFirst", &advice_push_fetch_first },
|
||||||
{ "pushNeedsForce", &advice_push_needs_force },
|
{ "pushNeedsForce", &advice_push_needs_force },
|
||||||
{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
|
{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
|
||||||
|
{ "pushRefNeedsUpdate", &advice_push_ref_needs_update },
|
||||||
{ "statusHints", &advice_status_hints },
|
{ "statusHints", &advice_status_hints },
|
||||||
{ "statusUoption", &advice_status_u_option },
|
{ "statusUoption", &advice_status_u_option },
|
||||||
{ "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
|
{ "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
|
||||||
|
@ -116,6 +118,7 @@ static struct {
|
||||||
[ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 },
|
[ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 },
|
||||||
[ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 },
|
[ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 },
|
||||||
[ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 },
|
[ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 },
|
||||||
|
[ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate", 1 },
|
||||||
|
|
||||||
/* make this an alias for backward compatibility */
|
/* make this an alias for backward compatibility */
|
||||||
[ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 },
|
[ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 },
|
||||||
|
|
2
advice.h
2
advice.h
|
@ -11,6 +11,7 @@ extern int advice_push_already_exists;
|
||||||
extern int advice_push_fetch_first;
|
extern int advice_push_fetch_first;
|
||||||
extern int advice_push_needs_force;
|
extern int advice_push_needs_force;
|
||||||
extern int advice_push_unqualified_ref_name;
|
extern int advice_push_unqualified_ref_name;
|
||||||
|
extern int advice_push_ref_needs_update;
|
||||||
extern int advice_status_hints;
|
extern int advice_status_hints;
|
||||||
extern int advice_status_u_option;
|
extern int advice_status_u_option;
|
||||||
extern int advice_status_ahead_behind_warning;
|
extern int advice_status_ahead_behind_warning;
|
||||||
|
@ -60,6 +61,7 @@ extern int advice_add_empty_pathspec;
|
||||||
ADVICE_PUSH_UNQUALIFIED_REF_NAME,
|
ADVICE_PUSH_UNQUALIFIED_REF_NAME,
|
||||||
ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
|
ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
|
||||||
ADVICE_PUSH_UPDATE_REJECTED,
|
ADVICE_PUSH_UPDATE_REJECTED,
|
||||||
|
ADVICE_PUSH_REF_NEEDS_UPDATE,
|
||||||
ADVICE_RESET_QUIET_WARNING,
|
ADVICE_RESET_QUIET_WARNING,
|
||||||
ADVICE_RESOLVE_CONFLICT,
|
ADVICE_RESOLVE_CONFLICT,
|
||||||
ADVICE_RM_HINTS,
|
ADVICE_RM_HINTS,
|
||||||
|
|
|
@ -290,6 +290,12 @@ static const char message_advice_ref_needs_force[] =
|
||||||
"or update a remote ref to make it point at a non-commit object,\n"
|
"or update a remote ref to make it point at a non-commit object,\n"
|
||||||
"without using the '--force' option.\n");
|
"without using the '--force' option.\n");
|
||||||
|
|
||||||
|
static const char message_advice_ref_needs_update[] =
|
||||||
|
N_("Updates were rejected because the tip of the remote-tracking\n"
|
||||||
|
"branch has been updated since the last checkout. You may want\n"
|
||||||
|
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||||
|
"before forcing an update.\n");
|
||||||
|
|
||||||
static void advise_pull_before_push(void)
|
static void advise_pull_before_push(void)
|
||||||
{
|
{
|
||||||
if (!advice_push_non_ff_current || !advice_push_update_rejected)
|
if (!advice_push_non_ff_current || !advice_push_update_rejected)
|
||||||
|
@ -325,6 +331,13 @@ static void advise_ref_needs_force(void)
|
||||||
advise(_(message_advice_ref_needs_force));
|
advise(_(message_advice_ref_needs_force));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void advise_ref_needs_update(void)
|
||||||
|
{
|
||||||
|
if (!advice_push_ref_needs_update || !advice_push_update_rejected)
|
||||||
|
return;
|
||||||
|
advise(_(message_advice_ref_needs_update));
|
||||||
|
}
|
||||||
|
|
||||||
static int push_with_options(struct transport *transport, struct refspec *rs,
|
static int push_with_options(struct transport *transport, struct refspec *rs,
|
||||||
int flags)
|
int flags)
|
||||||
{
|
{
|
||||||
|
@ -374,6 +387,8 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
|
||||||
advise_ref_fetch_first();
|
advise_ref_fetch_first();
|
||||||
} else if (reject_reasons & REJECT_NEEDS_FORCE) {
|
} else if (reject_reasons & REJECT_NEEDS_FORCE) {
|
||||||
advise_ref_needs_force();
|
advise_ref_needs_force();
|
||||||
|
} else if (reject_reasons & REJECT_REF_NEEDS_UPDATE) {
|
||||||
|
advise_ref_needs_update();
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -510,6 +525,12 @@ static int git_push_config(const char *k, const char *v, void *cb)
|
||||||
if (!v)
|
if (!v)
|
||||||
return config_error_nonbool(k);
|
return config_error_nonbool(k);
|
||||||
return color_parse(v, push_colors[slot]);
|
return color_parse(v, push_colors[slot]);
|
||||||
|
} else if (!strcmp(k, "push.useforceifincludes")) {
|
||||||
|
if (git_config_bool(k, v))
|
||||||
|
*flags |= TRANSPORT_PUSH_FORCE_IF_INCLUDES;
|
||||||
|
else
|
||||||
|
*flags &= ~TRANSPORT_PUSH_FORCE_IF_INCLUDES;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return git_default_config(k, v, NULL);
|
return git_default_config(k, v, NULL);
|
||||||
|
@ -541,6 +562,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
|
||||||
OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
|
OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
|
||||||
N_("require old value of ref to be at this value"),
|
N_("require old value of ref to be at this value"),
|
||||||
PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
|
PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
|
||||||
|
OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,
|
||||||
|
N_("require remote updates to be integrated locally"),
|
||||||
|
TRANSPORT_PUSH_FORCE_IF_INCLUDES),
|
||||||
OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
|
OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
|
||||||
N_("control recursive pushing of submodules"), option_parse_recurse_submodules),
|
N_("control recursive pushing of submodules"), option_parse_recurse_submodules),
|
||||||
OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
|
OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
|
||||||
|
@ -625,6 +649,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
|
||||||
if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
|
if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
|
||||||
die(_("--all and --mirror are incompatible"));
|
die(_("--all and --mirror are incompatible"));
|
||||||
|
|
||||||
|
if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
|
||||||
|
cas.use_force_if_includes = 1;
|
||||||
|
|
||||||
for_each_string_list_item(item, push_options)
|
for_each_string_list_item(item, push_options)
|
||||||
if (strchr(item->string, '\n'))
|
if (strchr(item->string, '\n'))
|
||||||
die(_("push options must not have new line characters"));
|
die(_("push options must not have new line characters"));
|
||||||
|
|
|
@ -71,6 +71,11 @@ static void print_helper_status(struct ref *ref)
|
||||||
msg = "stale info";
|
msg = "stale info";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case REF_STATUS_REJECT_REMOTE_UPDATED:
|
||||||
|
res = "error";
|
||||||
|
msg = "remote ref updated since checkout";
|
||||||
|
break;
|
||||||
|
|
||||||
case REF_STATUS_REJECT_ALREADY_EXISTS:
|
case REF_STATUS_REJECT_ALREADY_EXISTS:
|
||||||
res = "error";
|
res = "error";
|
||||||
msg = "already exists";
|
msg = "already exists";
|
||||||
|
@ -173,6 +178,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
||||||
int progress = -1;
|
int progress = -1;
|
||||||
int from_stdin = 0;
|
int from_stdin = 0;
|
||||||
struct push_cas_option cas = {0};
|
struct push_cas_option cas = {0};
|
||||||
|
int force_if_includes = 0;
|
||||||
struct packet_reader reader;
|
struct packet_reader reader;
|
||||||
|
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
|
@ -198,6 +204,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
||||||
OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
|
OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
|
||||||
N_("require old value of ref to be at this value"),
|
N_("require old value of ref to be at this value"),
|
||||||
PARSE_OPT_OPTARG, parseopt_push_cas_option),
|
PARSE_OPT_OPTARG, parseopt_push_cas_option),
|
||||||
|
OPT_BOOL(0, TRANS_OPT_FORCE_IF_INCLUDES, &force_if_includes,
|
||||||
|
N_("require remote updates to be integrated locally")),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -299,6 +307,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
||||||
if (!is_empty_cas(&cas))
|
if (!is_empty_cas(&cas))
|
||||||
apply_push_cas(&cas, remote, remote_refs);
|
apply_push_cas(&cas, remote, remote_refs);
|
||||||
|
|
||||||
|
if (!is_empty_cas(&cas) && force_if_includes)
|
||||||
|
cas.use_force_if_includes = 1;
|
||||||
|
|
||||||
set_ref_status_for_push(remote_refs, args.send_mirror,
|
set_ref_status_for_push(remote_refs, args.send_mirror,
|
||||||
args.force_update);
|
args.force_update);
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,8 @@ struct options {
|
||||||
from_promisor : 1,
|
from_promisor : 1,
|
||||||
|
|
||||||
atomic : 1,
|
atomic : 1,
|
||||||
object_format : 1;
|
object_format : 1,
|
||||||
|
force_if_includes : 1;
|
||||||
const struct git_hash_algo *hash_algo;
|
const struct git_hash_algo *hash_algo;
|
||||||
};
|
};
|
||||||
static struct options options;
|
static struct options options;
|
||||||
|
@ -131,6 +132,14 @@ static int set_option(const char *name, const char *value)
|
||||||
string_list_append(&cas_options, val.buf);
|
string_list_append(&cas_options, val.buf);
|
||||||
strbuf_release(&val);
|
strbuf_release(&val);
|
||||||
return 0;
|
return 0;
|
||||||
|
} else if (!strcmp(name, TRANS_OPT_FORCE_IF_INCLUDES)) {
|
||||||
|
if (!strcmp(value, "true"))
|
||||||
|
options.force_if_includes = 1;
|
||||||
|
else if (!strcmp(value, "false"))
|
||||||
|
options.force_if_includes = 0;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
return 0;
|
||||||
} else if (!strcmp(name, "cloning")) {
|
} else if (!strcmp(name, "cloning")) {
|
||||||
if (!strcmp(value, "true"))
|
if (!strcmp(value, "true"))
|
||||||
options.cloning = 1;
|
options.cloning = 1;
|
||||||
|
@ -1318,6 +1327,9 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs)
|
||||||
strvec_push(&args, cas_option->string);
|
strvec_push(&args, cas_option->string);
|
||||||
strvec_push(&args, url.buf);
|
strvec_push(&args, url.buf);
|
||||||
|
|
||||||
|
if (options.force_if_includes)
|
||||||
|
strvec_push(&args, "--force-if-includes");
|
||||||
|
|
||||||
strvec_push(&args, "--stdin");
|
strvec_push(&args, "--stdin");
|
||||||
for (i = 0; i < nr_spec; i++)
|
for (i = 0; i < nr_spec; i++)
|
||||||
packet_buf_write(&preamble, "%s\n", specs[i]);
|
packet_buf_write(&preamble, "%s\n", specs[i]);
|
||||||
|
|
184
remote.c
184
remote.c
|
@ -1568,12 +1568,23 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
|
||||||
* with the remote-tracking branch to find the value
|
* with the remote-tracking branch to find the value
|
||||||
* to expect, but we did not have such a tracking
|
* to expect, but we did not have such a tracking
|
||||||
* branch.
|
* branch.
|
||||||
|
*
|
||||||
|
* If the tip of the remote-tracking ref is unreachable
|
||||||
|
* from any reflog entry of its local ref indicating a
|
||||||
|
* possible update since checkout; reject the push.
|
||||||
*/
|
*/
|
||||||
if (ref->expect_old_sha1) {
|
if (ref->expect_old_sha1) {
|
||||||
if (!oideq(&ref->old_oid, &ref->old_oid_expect))
|
if (!oideq(&ref->old_oid, &ref->old_oid_expect))
|
||||||
reject_reason = REF_STATUS_REJECT_STALE;
|
reject_reason = REF_STATUS_REJECT_STALE;
|
||||||
|
else if (ref->check_reachable && ref->unreachable)
|
||||||
|
reject_reason =
|
||||||
|
REF_STATUS_REJECT_REMOTE_UPDATED;
|
||||||
else
|
else
|
||||||
/* If the ref isn't stale then force the update. */
|
/*
|
||||||
|
* If the ref isn't stale, and is reachable
|
||||||
|
* from from one of the reflog entries of
|
||||||
|
* the local branch, force the update.
|
||||||
|
*/
|
||||||
force_ref_update = 1;
|
force_ref_update = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2351,12 +2362,13 @@ int is_empty_cas(const struct push_cas_option *cas)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Look at remote.fetch refspec and see if we have a remote
|
* Look at remote.fetch refspec and see if we have a remote
|
||||||
* tracking branch for the refname there. Fill its current
|
* tracking branch for the refname there. Fill the name of
|
||||||
* value in sha1[].
|
* the remote-tracking branch in *dst_refname, and the name
|
||||||
|
* of the commit object at its tip in oid[].
|
||||||
* If we cannot do so, return negative to signal an error.
|
* If we cannot do so, return negative to signal an error.
|
||||||
*/
|
*/
|
||||||
static int remote_tracking(struct remote *remote, const char *refname,
|
static int remote_tracking(struct remote *remote, const char *refname,
|
||||||
struct object_id *oid)
|
struct object_id *oid, char **dst_refname)
|
||||||
{
|
{
|
||||||
char *dst;
|
char *dst;
|
||||||
|
|
||||||
|
@ -2365,9 +2377,150 @@ static int remote_tracking(struct remote *remote, const char *refname,
|
||||||
return -1; /* no tracking ref for refname at remote */
|
return -1; /* no tracking ref for refname at remote */
|
||||||
if (read_ref(dst, oid))
|
if (read_ref(dst, oid))
|
||||||
return -1; /* we know what the tracking ref is but we cannot read it */
|
return -1; /* we know what the tracking ref is but we cannot read it */
|
||||||
|
|
||||||
|
*dst_refname = dst;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The struct "reflog_commit_array" and related helper functions
|
||||||
|
* are used for collecting commits into an array during reflog
|
||||||
|
* traversals in "check_and_collect_until()".
|
||||||
|
*/
|
||||||
|
struct reflog_commit_array {
|
||||||
|
struct commit **item;
|
||||||
|
size_t nr, alloc;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
|
||||||
|
|
||||||
|
/* Append a commit to the array. */
|
||||||
|
static void append_commit(struct reflog_commit_array *arr,
|
||||||
|
struct commit *commit)
|
||||||
|
{
|
||||||
|
ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
|
||||||
|
arr->item[arr->nr++] = commit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free and reset the array. */
|
||||||
|
static void free_commit_array(struct reflog_commit_array *arr)
|
||||||
|
{
|
||||||
|
FREE_AND_NULL(arr->item);
|
||||||
|
arr->nr = arr->alloc = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct check_and_collect_until_cb_data {
|
||||||
|
struct commit *remote_commit;
|
||||||
|
struct reflog_commit_array *local_commits;
|
||||||
|
timestamp_t remote_reflog_timestamp;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Get the timestamp of the latest entry. */
|
||||||
|
static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
|
||||||
|
const char *ident, timestamp_t timestamp,
|
||||||
|
int tz, const char *message, void *cb_data)
|
||||||
|
{
|
||||||
|
timestamp_t *ts = cb_data;
|
||||||
|
*ts = timestamp;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int check_and_collect_until(struct object_id *o_oid,
|
||||||
|
struct object_id *n_oid,
|
||||||
|
const char *ident, timestamp_t timestamp,
|
||||||
|
int tz, const char *message, void *cb_data)
|
||||||
|
{
|
||||||
|
struct commit *commit;
|
||||||
|
struct check_and_collect_until_cb_data *cb = cb_data;
|
||||||
|
|
||||||
|
/* An entry was found. */
|
||||||
|
if (oideq(n_oid, &cb->remote_commit->object.oid))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
if ((commit = lookup_commit_reference(the_repository, n_oid)))
|
||||||
|
append_commit(cb->local_commits, commit);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the reflog entry timestamp is older than the remote ref's
|
||||||
|
* latest reflog entry, there is no need to check or collect
|
||||||
|
* entries older than this one.
|
||||||
|
*/
|
||||||
|
if (timestamp < cb->remote_reflog_timestamp)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define MERGE_BASES_BATCH_SIZE 8
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Iterate through the reflog of the local ref to check if there is an entry
|
||||||
|
* for the given remote-tracking ref; runs until the timestamp of an entry is
|
||||||
|
* older than latest timestamp of remote-tracking ref's reflog. Any commits
|
||||||
|
* are that seen along the way are collected into an array to check if the
|
||||||
|
* remote-tracking ref is reachable from any of them.
|
||||||
|
*/
|
||||||
|
static int is_reachable_in_reflog(const char *local, const struct ref *remote)
|
||||||
|
{
|
||||||
|
timestamp_t date;
|
||||||
|
struct commit *commit;
|
||||||
|
struct commit **chunk;
|
||||||
|
struct check_and_collect_until_cb_data cb;
|
||||||
|
struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
|
||||||
|
size_t size = 0;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
commit = lookup_commit_reference(the_repository, &remote->old_oid);
|
||||||
|
if (!commit)
|
||||||
|
goto cleanup_return;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the timestamp from the latest entry
|
||||||
|
* of the remote-tracking ref's reflog.
|
||||||
|
*/
|
||||||
|
for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
|
||||||
|
|
||||||
|
cb.remote_commit = commit;
|
||||||
|
cb.local_commits = &arr;
|
||||||
|
cb.remote_reflog_timestamp = date;
|
||||||
|
ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
|
||||||
|
|
||||||
|
/* We found an entry in the reflog. */
|
||||||
|
if (ret > 0)
|
||||||
|
goto cleanup_return;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check if the remote commit is reachable from any
|
||||||
|
* of the commits in the collected array, in batches.
|
||||||
|
*/
|
||||||
|
for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
|
||||||
|
size = arr.item + arr.nr - chunk;
|
||||||
|
if (MERGE_BASES_BATCH_SIZE < size)
|
||||||
|
size = MERGE_BASES_BATCH_SIZE;
|
||||||
|
|
||||||
|
if ((ret = in_merge_bases_many(commit, size, chunk)))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup_return:
|
||||||
|
free_commit_array(&arr);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for reachability of a remote-tracking
|
||||||
|
* ref in the reflog entries of its local ref.
|
||||||
|
*/
|
||||||
|
static void check_if_includes_upstream(struct ref *remote)
|
||||||
|
{
|
||||||
|
struct ref *local = get_local_ref(remote->name);
|
||||||
|
if (!local)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (is_reachable_in_reflog(local->name, remote) <= 0)
|
||||||
|
remote->unreachable = 1;
|
||||||
|
}
|
||||||
|
|
||||||
static void apply_cas(struct push_cas_option *cas,
|
static void apply_cas(struct push_cas_option *cas,
|
||||||
struct remote *remote,
|
struct remote *remote,
|
||||||
struct ref *ref)
|
struct ref *ref)
|
||||||
|
@ -2382,8 +2535,12 @@ static void apply_cas(struct push_cas_option *cas,
|
||||||
ref->expect_old_sha1 = 1;
|
ref->expect_old_sha1 = 1;
|
||||||
if (!entry->use_tracking)
|
if (!entry->use_tracking)
|
||||||
oidcpy(&ref->old_oid_expect, &entry->expect);
|
oidcpy(&ref->old_oid_expect, &entry->expect);
|
||||||
else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
|
else if (remote_tracking(remote, ref->name,
|
||||||
|
&ref->old_oid_expect,
|
||||||
|
&ref->tracking_ref))
|
||||||
oidclr(&ref->old_oid_expect);
|
oidclr(&ref->old_oid_expect);
|
||||||
|
else
|
||||||
|
ref->check_reachable = cas->use_force_if_includes;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2392,8 +2549,12 @@ static void apply_cas(struct push_cas_option *cas,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ref->expect_old_sha1 = 1;
|
ref->expect_old_sha1 = 1;
|
||||||
if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
|
if (remote_tracking(remote, ref->name,
|
||||||
|
&ref->old_oid_expect,
|
||||||
|
&ref->tracking_ref))
|
||||||
oidclr(&ref->old_oid_expect);
|
oidclr(&ref->old_oid_expect);
|
||||||
|
else
|
||||||
|
ref->check_reachable = cas->use_force_if_includes;
|
||||||
}
|
}
|
||||||
|
|
||||||
void apply_push_cas(struct push_cas_option *cas,
|
void apply_push_cas(struct push_cas_option *cas,
|
||||||
|
@ -2401,6 +2562,15 @@ void apply_push_cas(struct push_cas_option *cas,
|
||||||
struct ref *remote_refs)
|
struct ref *remote_refs)
|
||||||
{
|
{
|
||||||
struct ref *ref;
|
struct ref *ref;
|
||||||
for (ref = remote_refs; ref; ref = ref->next)
|
for (ref = remote_refs; ref; ref = ref->next) {
|
||||||
apply_cas(cas, remote, ref);
|
apply_cas(cas, remote, ref);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If "compare-and-swap" is in "use_tracking[_for_rest]"
|
||||||
|
* mode, and if "--force-if-includes" was specified, run
|
||||||
|
* the check.
|
||||||
|
*/
|
||||||
|
if (ref->check_reachable)
|
||||||
|
check_if_includes_upstream(ref);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
12
remote.h
12
remote.h
|
@ -107,12 +107,20 @@ struct ref {
|
||||||
struct object_id new_oid;
|
struct object_id new_oid;
|
||||||
struct object_id old_oid_expect; /* used by expect-old */
|
struct object_id old_oid_expect; /* used by expect-old */
|
||||||
char *symref;
|
char *symref;
|
||||||
|
char *tracking_ref;
|
||||||
unsigned int
|
unsigned int
|
||||||
force:1,
|
force:1,
|
||||||
forced_update:1,
|
forced_update:1,
|
||||||
expect_old_sha1:1,
|
expect_old_sha1:1,
|
||||||
exact_oid:1,
|
exact_oid:1,
|
||||||
deletion:1;
|
deletion:1,
|
||||||
|
/* Need to check if local reflog reaches the remote tip. */
|
||||||
|
check_reachable:1,
|
||||||
|
/*
|
||||||
|
* Store the result of the check enabled by "check_reachable";
|
||||||
|
* implies the local reflog does not reach the remote tip.
|
||||||
|
*/
|
||||||
|
unreachable:1;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
REF_NOT_MATCHED = 0, /* initial value */
|
REF_NOT_MATCHED = 0, /* initial value */
|
||||||
|
@ -142,6 +150,7 @@ struct ref {
|
||||||
REF_STATUS_REJECT_NEEDS_FORCE,
|
REF_STATUS_REJECT_NEEDS_FORCE,
|
||||||
REF_STATUS_REJECT_STALE,
|
REF_STATUS_REJECT_STALE,
|
||||||
REF_STATUS_REJECT_SHALLOW,
|
REF_STATUS_REJECT_SHALLOW,
|
||||||
|
REF_STATUS_REJECT_REMOTE_UPDATED,
|
||||||
REF_STATUS_UPTODATE,
|
REF_STATUS_UPTODATE,
|
||||||
REF_STATUS_REMOTE_REJECT,
|
REF_STATUS_REMOTE_REJECT,
|
||||||
REF_STATUS_EXPECTING_REPORT,
|
REF_STATUS_EXPECTING_REPORT,
|
||||||
|
@ -348,6 +357,7 @@ struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);
|
||||||
|
|
||||||
struct push_cas_option {
|
struct push_cas_option {
|
||||||
unsigned use_tracking_for_rest:1;
|
unsigned use_tracking_for_rest:1;
|
||||||
|
unsigned use_force_if_includes:1;
|
||||||
struct push_cas {
|
struct push_cas {
|
||||||
struct object_id expect;
|
struct object_id expect;
|
||||||
unsigned use_tracking:1;
|
unsigned use_tracking:1;
|
||||||
|
|
|
@ -299,6 +299,7 @@ static int check_to_send_update(const struct ref *ref, const struct send_pack_ar
|
||||||
case REF_STATUS_REJECT_FETCH_FIRST:
|
case REF_STATUS_REJECT_FETCH_FIRST:
|
||||||
case REF_STATUS_REJECT_NEEDS_FORCE:
|
case REF_STATUS_REJECT_NEEDS_FORCE:
|
||||||
case REF_STATUS_REJECT_STALE:
|
case REF_STATUS_REJECT_STALE:
|
||||||
|
case REF_STATUS_REJECT_REMOTE_UPDATED:
|
||||||
case REF_STATUS_REJECT_NODELETE:
|
case REF_STATUS_REJECT_NODELETE:
|
||||||
return CHECK_REF_STATUS_REJECTED;
|
return CHECK_REF_STATUS_REJECTED;
|
||||||
case REF_STATUS_UPTODATE:
|
case REF_STATUS_UPTODATE:
|
||||||
|
|
|
@ -13,6 +13,46 @@ setup_srcdst_basic () {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# For tests with "--force-if-includes".
|
||||||
|
setup_src_dup_dst () {
|
||||||
|
rm -fr src dup dst &&
|
||||||
|
git init --bare dst &&
|
||||||
|
git clone --no-local dst src &&
|
||||||
|
git clone --no-local dst dup
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
test_commit A &&
|
||||||
|
test_commit B &&
|
||||||
|
test_commit C &&
|
||||||
|
git push origin
|
||||||
|
) &&
|
||||||
|
(
|
||||||
|
cd dup &&
|
||||||
|
git fetch &&
|
||||||
|
git merge origin/master &&
|
||||||
|
git switch -c branch master~2 &&
|
||||||
|
test_commit D &&
|
||||||
|
test_commit E &&
|
||||||
|
git push origin --all
|
||||||
|
) &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch master &&
|
||||||
|
git fetch --all &&
|
||||||
|
git branch branch --track origin/branch &&
|
||||||
|
git rebase origin/master
|
||||||
|
) &&
|
||||||
|
(
|
||||||
|
cd dup &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit F &&
|
||||||
|
test_commit G &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit H &&
|
||||||
|
git push origin --all
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
# create template repository
|
# create template repository
|
||||||
test_commit A &&
|
test_commit A &&
|
||||||
|
@ -256,4 +296,101 @@ test_expect_success 'background updates of REMOTE can be mitigated with a non-up
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'background updates to remote can be mitigated with "--force-if-includes"' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
git ls-remote dst refs/heads/master >expect.master &&
|
||||||
|
git ls-remote dst refs/heads/branch >expect.branch &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit I &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit J &&
|
||||||
|
git fetch --all &&
|
||||||
|
test_must_fail git push --force-with-lease --force-if-includes --all
|
||||||
|
) &&
|
||||||
|
git ls-remote dst refs/heads/master >actual.master &&
|
||||||
|
git ls-remote dst refs/heads/branch >actual.branch &&
|
||||||
|
test_cmp expect.master actual.master &&
|
||||||
|
test_cmp expect.branch actual.branch
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'background updates to remote can be mitigated with "push.useForceIfIncludes"' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
git ls-remote dst refs/heads/master >expect.master &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit I &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit J &&
|
||||||
|
git fetch --all &&
|
||||||
|
git config --local push.useForceIfIncludes true &&
|
||||||
|
test_must_fail git push --force-with-lease=master origin master
|
||||||
|
) &&
|
||||||
|
git ls-remote dst refs/heads/master >actual.master &&
|
||||||
|
test_cmp expect.master actual.master
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
git ls-remote dst refs/heads/master >expect.master &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit I &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit J &&
|
||||||
|
remote_head="$(git rev-parse refs/remotes/origin/master)" &&
|
||||||
|
git fetch --all &&
|
||||||
|
test_must_fail git push --force-if-includes --force-with-lease="master:$remote_head" 2>err &&
|
||||||
|
grep "stale info" err
|
||||||
|
) &&
|
||||||
|
git ls-remote dst refs/heads/master >actual.master &&
|
||||||
|
test_cmp expect.master actual.master
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit I &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit J &&
|
||||||
|
git pull --rebase origin master &&
|
||||||
|
git push --force-if-includes --force-with-lease="master"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
test_commit I &&
|
||||||
|
git switch master &&
|
||||||
|
test_commit J &&
|
||||||
|
git pull --rebase origin master &&
|
||||||
|
git rebase --onto HEAD~4 HEAD~1 &&
|
||||||
|
git push --force-if-includes --force-with-lease="master"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"--force-if-includes" should allow deletes' '
|
||||||
|
setup_src_dup_dst &&
|
||||||
|
test_when_finished "rm -fr dst src dup" &&
|
||||||
|
(
|
||||||
|
cd src &&
|
||||||
|
git switch branch &&
|
||||||
|
git pull --rebase origin branch &&
|
||||||
|
git push --force-if-includes --force-with-lease="branch" origin :branch
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
@ -827,6 +827,10 @@ static int push_update_ref_status(struct strbuf *buf,
|
||||||
status = REF_STATUS_REJECT_STALE;
|
status = REF_STATUS_REJECT_STALE;
|
||||||
FREE_AND_NULL(msg);
|
FREE_AND_NULL(msg);
|
||||||
}
|
}
|
||||||
|
else if (!strcmp(msg, "remote ref updated since checkout")) {
|
||||||
|
status = REF_STATUS_REJECT_REMOTE_UPDATED;
|
||||||
|
FREE_AND_NULL(msg);
|
||||||
|
}
|
||||||
else if (!strcmp(msg, "forced update")) {
|
else if (!strcmp(msg, "forced update")) {
|
||||||
forced = 1;
|
forced = 1;
|
||||||
FREE_AND_NULL(msg);
|
FREE_AND_NULL(msg);
|
||||||
|
@ -934,6 +938,11 @@ static void set_common_push_options(struct transport *transport,
|
||||||
if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0)
|
if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0)
|
||||||
die(_("helper %s does not support --atomic"), name);
|
die(_("helper %s does not support --atomic"), name);
|
||||||
|
|
||||||
|
if (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES)
|
||||||
|
if (set_helper_option(transport, TRANS_OPT_FORCE_IF_INCLUDES, "true") != 0)
|
||||||
|
die(_("helper %s does not support --%s"),
|
||||||
|
name, TRANS_OPT_FORCE_IF_INCLUDES);
|
||||||
|
|
||||||
if (flags & TRANSPORT_PUSH_OPTIONS) {
|
if (flags & TRANSPORT_PUSH_OPTIONS) {
|
||||||
struct string_list_item *item;
|
struct string_list_item *item;
|
||||||
for_each_string_list_item(item, transport->push_options)
|
for_each_string_list_item(item, transport->push_options)
|
||||||
|
@ -967,6 +976,7 @@ static int push_refs_with_push(struct transport *transport,
|
||||||
case REF_STATUS_REJECT_NONFASTFORWARD:
|
case REF_STATUS_REJECT_NONFASTFORWARD:
|
||||||
case REF_STATUS_REJECT_STALE:
|
case REF_STATUS_REJECT_STALE:
|
||||||
case REF_STATUS_REJECT_ALREADY_EXISTS:
|
case REF_STATUS_REJECT_ALREADY_EXISTS:
|
||||||
|
case REF_STATUS_REJECT_REMOTE_UPDATED:
|
||||||
if (atomic) {
|
if (atomic) {
|
||||||
reject_atomic_push(remote_refs, mirror);
|
reject_atomic_push(remote_refs, mirror);
|
||||||
string_list_clear(&cas_options, 0);
|
string_list_clear(&cas_options, 0);
|
||||||
|
|
|
@ -633,6 +633,11 @@ static int print_one_push_report(struct ref *ref, const char *dest, int count,
|
||||||
"stale info",
|
"stale info",
|
||||||
report, porcelain, summary_width);
|
report, porcelain, summary_width);
|
||||||
break;
|
break;
|
||||||
|
case REF_STATUS_REJECT_REMOTE_UPDATED:
|
||||||
|
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
|
||||||
|
"remote ref updated since checkout",
|
||||||
|
report, porcelain, summary_width);
|
||||||
|
break;
|
||||||
case REF_STATUS_REJECT_SHALLOW:
|
case REF_STATUS_REJECT_SHALLOW:
|
||||||
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
|
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
|
||||||
"new shallow roots not allowed",
|
"new shallow roots not allowed",
|
||||||
|
@ -743,6 +748,8 @@ void transport_print_push_status(const char *dest, struct ref *refs,
|
||||||
*reject_reasons |= REJECT_FETCH_FIRST;
|
*reject_reasons |= REJECT_FETCH_FIRST;
|
||||||
} else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) {
|
} else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) {
|
||||||
*reject_reasons |= REJECT_NEEDS_FORCE;
|
*reject_reasons |= REJECT_NEEDS_FORCE;
|
||||||
|
} else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) {
|
||||||
|
*reject_reasons |= REJECT_REF_NEEDS_UPDATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
free(head);
|
free(head);
|
||||||
|
@ -1185,6 +1192,7 @@ static int run_pre_push_hook(struct transport *transport,
|
||||||
if (!r->peer_ref) continue;
|
if (!r->peer_ref) continue;
|
||||||
if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
|
if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
|
||||||
if (r->status == REF_STATUS_REJECT_STALE) continue;
|
if (r->status == REF_STATUS_REJECT_STALE) continue;
|
||||||
|
if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue;
|
||||||
if (r->status == REF_STATUS_UPTODATE) continue;
|
if (r->status == REF_STATUS_UPTODATE) continue;
|
||||||
|
|
||||||
strbuf_reset(&buf);
|
strbuf_reset(&buf);
|
||||||
|
|
15
transport.h
15
transport.h
|
@ -136,6 +136,7 @@ struct transport {
|
||||||
#define TRANSPORT_PUSH_ATOMIC (1<<13)
|
#define TRANSPORT_PUSH_ATOMIC (1<<13)
|
||||||
#define TRANSPORT_PUSH_OPTIONS (1<<14)
|
#define TRANSPORT_PUSH_OPTIONS (1<<14)
|
||||||
#define TRANSPORT_RECURSE_SUBMODULES_ONLY (1<<15)
|
#define TRANSPORT_RECURSE_SUBMODULES_ONLY (1<<15)
|
||||||
|
#define TRANSPORT_PUSH_FORCE_IF_INCLUDES (1<<16)
|
||||||
|
|
||||||
int transport_summary_width(const struct ref *refs);
|
int transport_summary_width(const struct ref *refs);
|
||||||
|
|
||||||
|
@ -208,6 +209,9 @@ void transport_check_allowed(const char *type);
|
||||||
/* Request atomic (all-or-nothing) updates when pushing */
|
/* Request atomic (all-or-nothing) updates when pushing */
|
||||||
#define TRANS_OPT_ATOMIC "atomic"
|
#define TRANS_OPT_ATOMIC "atomic"
|
||||||
|
|
||||||
|
/* Require remote changes to be integrated locally. */
|
||||||
|
#define TRANS_OPT_FORCE_IF_INCLUDES "force-if-includes"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns 0 if the option was used, non-zero otherwise. Prints a
|
* Returns 0 if the option was used, non-zero otherwise. Prints a
|
||||||
* message to stderr if the option is not used.
|
* message to stderr if the option is not used.
|
||||||
|
@ -217,11 +221,12 @@ int transport_set_option(struct transport *transport, const char *name,
|
||||||
void transport_set_verbosity(struct transport *transport, int verbosity,
|
void transport_set_verbosity(struct transport *transport, int verbosity,
|
||||||
int force_progress);
|
int force_progress);
|
||||||
|
|
||||||
#define REJECT_NON_FF_HEAD 0x01
|
#define REJECT_NON_FF_HEAD 0x01
|
||||||
#define REJECT_NON_FF_OTHER 0x02
|
#define REJECT_NON_FF_OTHER 0x02
|
||||||
#define REJECT_ALREADY_EXISTS 0x04
|
#define REJECT_ALREADY_EXISTS 0x04
|
||||||
#define REJECT_FETCH_FIRST 0x08
|
#define REJECT_FETCH_FIRST 0x08
|
||||||
#define REJECT_NEEDS_FORCE 0x10
|
#define REJECT_NEEDS_FORCE 0x10
|
||||||
|
#define REJECT_REF_NEEDS_UPDATE 0x20
|
||||||
|
|
||||||
int transport_push(struct repository *repo,
|
int transport_push(struct repository *repo,
|
||||||
struct transport *connection,
|
struct transport *connection,
|
||||||
|
|
Loading…
Reference in New Issue