2008-07-07 17:24:20 +00:00
|
|
|
/*
|
|
|
|
* Builtin "git merge"
|
|
|
|
*
|
|
|
|
* Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
|
|
|
|
*
|
|
|
|
* Based on git-merge.sh by Junio C Hamano.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2008-07-07 17:24:20 +00:00
|
|
|
#include "parse-options.h"
|
|
|
|
#include "builtin.h"
|
2014-10-01 10:28:42 +00:00
|
|
|
#include "lockfile.h"
|
2008-07-07 17:24:20 +00:00
|
|
|
#include "run-command.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diffcore.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "unpack-trees.h"
|
|
|
|
#include "cache-tree.h"
|
|
|
|
#include "dir.h"
|
|
|
|
#include "utf8.h"
|
|
|
|
#include "log-tree.h"
|
|
|
|
#include "color.h"
|
2008-07-16 02:09:46 +00:00
|
|
|
#include "rerere.h"
|
2008-07-29 23:16:59 +00:00
|
|
|
#include "help.h"
|
2008-08-28 13:43:00 +00:00
|
|
|
#include "merge-recursive.h"
|
2009-12-25 08:30:51 +00:00
|
|
|
#include "resolve-undo.h"
|
2011-03-24 06:48:24 +00:00
|
|
|
#include "remote.h"
|
2011-10-07 06:12:09 +00:00
|
|
|
#include "fmt-merge-msg.h"
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 00:23:20 +00:00
|
|
|
#include "gpg-interface.h"
|
2014-10-24 18:34:59 +00:00
|
|
|
#include "sequencer.h"
|
2016-08-05 21:01:35 +00:00
|
|
|
#include "string-list.h"
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
#define DEFAULT_TWOHEAD (1<<0)
|
|
|
|
#define DEFAULT_OCTOPUS (1<<1)
|
|
|
|
#define NO_FAST_FORWARD (1<<2)
|
|
|
|
#define NO_TRIVIAL (1<<3)
|
|
|
|
|
|
|
|
struct strategy {
|
|
|
|
const char *name;
|
|
|
|
unsigned attr;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const builtin_merge_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git merge [<options>] [<commit>...]"),
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("git merge --abort"),
|
2016-12-14 08:37:55 +00:00
|
|
|
N_("git merge --continue"),
|
2008-07-07 17:24:20 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2011-10-07 06:12:09 +00:00
|
|
|
static int show_diffstat = 1, shortlog_len = -1, squash;
|
2013-07-02 14:47:57 +00:00
|
|
|
static int option_commit = 1;
|
|
|
|
static int option_edit = -1;
|
2013-03-31 16:02:24 +00:00
|
|
|
static int allow_trivial = 1, have_message, verify_signatures;
|
2011-11-27 10:15:33 +00:00
|
|
|
static int overwrite_ignore = 1;
|
2011-12-18 05:03:22 +00:00
|
|
|
static struct strbuf merge_msg = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
static struct strategy **use_strategies;
|
|
|
|
static size_t use_strategies_nr, use_strategies_alloc;
|
2009-11-26 02:23:55 +00:00
|
|
|
static const char **xopts;
|
|
|
|
static size_t xopts_nr, xopts_alloc;
|
2008-07-07 17:24:20 +00:00
|
|
|
static const char *branch;
|
2011-05-05 00:42:51 +00:00
|
|
|
static char *branch_mergeoptions;
|
2010-08-05 11:32:41 +00:00
|
|
|
static int option_renormalize;
|
2008-11-15 00:14:24 +00:00
|
|
|
static int verbosity;
|
2009-12-04 08:20:48 +00:00
|
|
|
static int allow_rerere_auto;
|
2010-11-09 21:49:59 +00:00
|
|
|
static int abort_current_merge;
|
2016-12-14 08:37:55 +00:00
|
|
|
static int continue_current_merge;
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 20:21:09 +00:00
|
|
|
static int allow_unrelated_histories;
|
2011-02-20 09:53:21 +00:00
|
|
|
static int show_progress = -1;
|
2014-04-21 00:17:33 +00:00
|
|
|
static int default_to_upstream = 1;
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 00:23:20 +00:00
|
|
|
static const char *sign_commit;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
static struct strategy all_strategy[] = {
|
|
|
|
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
|
|
|
|
{ "octopus", DEFAULT_OCTOPUS },
|
|
|
|
{ "resolve", 0 },
|
|
|
|
{ "ours", NO_FAST_FORWARD | NO_TRIVIAL },
|
|
|
|
{ "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *pull_twohead, *pull_octopus;
|
|
|
|
|
2013-07-02 14:47:57 +00:00
|
|
|
enum ff_type {
|
|
|
|
FF_NO,
|
|
|
|
FF_ALLOW,
|
|
|
|
FF_ONLY
|
|
|
|
};
|
|
|
|
|
|
|
|
static enum ff_type fast_forward = FF_ALLOW;
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
static int option_parse_message(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct strbuf *buf = opt->value;
|
|
|
|
|
|
|
|
if (unset)
|
|
|
|
strbuf_setlen(buf, 0);
|
2008-07-20 12:34:47 +00:00
|
|
|
else if (arg) {
|
2009-12-02 18:00:58 +00:00
|
|
|
strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg);
|
2008-07-07 17:24:20 +00:00
|
|
|
have_message = 1;
|
2008-07-20 12:34:47 +00:00
|
|
|
} else
|
2011-02-22 23:41:59 +00:00
|
|
|
return error(_("switch `m' requires a value"));
|
2008-07-07 17:24:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct strategy *get_strategy(const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
2008-07-29 23:16:59 +00:00
|
|
|
struct strategy *ret;
|
|
|
|
static struct cmdnames main_cmds, other_cmds;
|
2008-08-28 17:15:33 +00:00
|
|
|
static int loaded;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
if (!name)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
|
|
|
|
if (!strcmp(name, all_strategy[i].name))
|
|
|
|
return &all_strategy[i];
|
2008-07-21 16:10:47 +00:00
|
|
|
|
2008-08-28 17:15:33 +00:00
|
|
|
if (!loaded) {
|
2008-07-29 23:16:59 +00:00
|
|
|
struct cmdnames not_strategies;
|
2008-08-28 17:15:33 +00:00
|
|
|
loaded = 1;
|
2008-07-29 23:16:59 +00:00
|
|
|
|
|
|
|
memset(¬_strategies, 0, sizeof(struct cmdnames));
|
2008-08-28 17:15:33 +00:00
|
|
|
load_command_list("git-merge-", &main_cmds, &other_cmds);
|
2008-07-29 23:16:59 +00:00
|
|
|
for (i = 0; i < main_cmds.cnt; i++) {
|
|
|
|
int j, found = 0;
|
|
|
|
struct cmdname *ent = main_cmds.names[i];
|
|
|
|
for (j = 0; j < ARRAY_SIZE(all_strategy); j++)
|
|
|
|
if (!strncmp(ent->name, all_strategy[j].name, ent->len)
|
|
|
|
&& !all_strategy[j].name[ent->len])
|
|
|
|
found = 1;
|
|
|
|
if (!found)
|
|
|
|
add_cmdname(¬_strategies, ent->name, ent->len);
|
|
|
|
}
|
2009-11-26 02:23:54 +00:00
|
|
|
exclude_cmds(&main_cmds, ¬_strategies);
|
2008-07-29 23:16:59 +00:00
|
|
|
}
|
|
|
|
if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
|
2011-02-22 23:41:59 +00:00
|
|
|
fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name);
|
|
|
|
fprintf(stderr, _("Available strategies are:"));
|
2008-08-21 05:07:55 +00:00
|
|
|
for (i = 0; i < main_cmds.cnt; i++)
|
|
|
|
fprintf(stderr, " %s", main_cmds.names[i]->name);
|
|
|
|
fprintf(stderr, ".\n");
|
|
|
|
if (other_cmds.cnt) {
|
2011-02-22 23:41:59 +00:00
|
|
|
fprintf(stderr, _("Available custom strategies are:"));
|
2008-08-21 05:07:55 +00:00
|
|
|
for (i = 0; i < other_cmds.cnt; i++)
|
|
|
|
fprintf(stderr, " %s", other_cmds.names[i]->name);
|
|
|
|
fprintf(stderr, ".\n");
|
|
|
|
}
|
2008-07-29 23:16:59 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2008-10-06 23:39:10 +00:00
|
|
|
ret = xcalloc(1, sizeof(struct strategy));
|
2008-07-29 23:16:59 +00:00
|
|
|
ret->name = xstrdup(name);
|
2010-08-16 01:11:06 +00:00
|
|
|
ret->attr = NO_TRIVIAL;
|
2008-07-29 23:16:59 +00:00
|
|
|
return ret;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void append_strategy(struct strategy *s)
|
|
|
|
{
|
|
|
|
ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc);
|
|
|
|
use_strategies[use_strategies_nr++] = s;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int option_parse_strategy(const struct option *opt,
|
|
|
|
const char *name, int unset)
|
|
|
|
{
|
|
|
|
if (unset)
|
|
|
|
return 0;
|
|
|
|
|
2008-07-21 16:10:47 +00:00
|
|
|
append_strategy(get_strategy(name));
|
2008-07-07 17:24:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-26 02:23:55 +00:00
|
|
|
static int option_parse_x(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
if (unset)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ALLOC_GROW(xopts, xopts_nr + 1, xopts_alloc);
|
|
|
|
xopts[xopts_nr++] = xstrdup(arg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
static int option_parse_n(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
show_diffstat = unset;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct option builtin_merge_options[] = {
|
|
|
|
{ OPTION_CALLBACK, 'n', NULL, NULL, NULL,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("do not show a diffstat at the end of the merge"),
|
2008-07-07 17:24:20 +00:00
|
|
|
PARSE_OPT_NOARG, option_parse_n },
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "stat", &show_diffstat,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("show a diffstat at the end of the merge")),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
|
2012-08-20 12:32:24 +00:00
|
|
|
{ OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
|
|
|
|
N_("add (at most <n>) entries from shortlog to merge commit message"),
|
2010-09-08 17:59:54 +00:00
|
|
|
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "squash", &squash,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("create a single commit instead of doing a merge")),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "commit", &option_commit,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("perform a commit if the merge succeeds (default)")),
|
2012-01-11 06:44:45 +00:00
|
|
|
OPT_BOOL('e', "edit", &option_edit,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("edit message before committing")),
|
2013-07-02 14:47:57 +00:00
|
|
|
OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW),
|
2013-10-31 09:25:32 +00:00
|
|
|
{ OPTION_SET_INT, 0, "ff-only", &fast_forward, NULL,
|
2013-07-02 14:47:57 +00:00
|
|
|
N_("abort if fast-forward is not possible"),
|
2013-10-31 09:25:32 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
|
2009-12-04 08:20:48 +00:00
|
|
|
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
|
2013-03-31 16:02:24 +00:00
|
|
|
OPT_BOOL(0, "verify-signatures", &verify_signatures,
|
2016-06-17 20:21:18 +00:00
|
|
|
N_("verify that the named commit has a valid GPG signature")),
|
2012-08-20 12:32:24 +00:00
|
|
|
OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
|
|
|
|
N_("merge strategy to use"), option_parse_strategy),
|
|
|
|
OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
|
|
|
|
N_("option for selected merge strategy"), option_parse_x),
|
|
|
|
OPT_CALLBACK('m', "message", &merge_msg, N_("message"),
|
|
|
|
N_("merge commit message (for a non-fast-forward merge)"),
|
2008-07-07 17:24:20 +00:00
|
|
|
option_parse_message),
|
2008-11-15 00:14:24 +00:00
|
|
|
OPT__VERBOSITY(&verbosity),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "abort", &abort_current_merge,
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("abort the current in-progress merge")),
|
2016-12-14 08:37:55 +00:00
|
|
|
OPT_BOOL(0, "continue", &continue_current_merge,
|
|
|
|
N_("continue the current in-progress merge")),
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 20:21:09 +00:00
|
|
|
OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
|
|
|
|
N_("allow merging unrelated histories")),
|
2012-08-20 12:32:24 +00:00
|
|
|
OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
|
2014-03-23 22:58:12 +00:00
|
|
|
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
|
2008-07-07 17:24:20 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Cleans up metadata that is uninteresting after a succeeded merge. */
|
|
|
|
static void drop_save(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_merge_head());
|
|
|
|
unlink(git_path_merge_msg());
|
|
|
|
unlink(git_path_merge_mode());
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
static int save_state(struct object_id *stash)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
|
|
|
int len;
|
2014-08-19 19:09:35 +00:00
|
|
|
struct child_process cp = CHILD_PROCESS_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
|
|
|
const char *argv[] = {"stash", "create", NULL};
|
|
|
|
|
|
|
|
cp.argv = argv;
|
|
|
|
cp.out = -1;
|
|
|
|
cp.git_cmd = 1;
|
|
|
|
|
|
|
|
if (start_command(&cp))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("could not run stash."));
|
2008-07-07 17:24:20 +00:00
|
|
|
len = strbuf_read(&buffer, cp.out, 1024);
|
|
|
|
close(cp.out);
|
|
|
|
|
|
|
|
if (finish_command(&cp) || len < 0)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("stash failed"));
|
2011-08-19 14:50:05 +00:00
|
|
|
else if (!len) /* no changes */
|
|
|
|
return -1;
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_setlen(&buffer, buffer.len-1);
|
2017-02-21 23:47:28 +00:00
|
|
|
if (get_oid(buffer.buf, stash))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("not a valid object: %s"), buffer.buf);
|
2011-08-19 14:50:05 +00:00
|
|
|
return 0;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2010-11-14 22:07:49 +00:00
|
|
|
static void read_empty(unsigned const char *sha1, int verbose)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
const char *args[7];
|
|
|
|
|
|
|
|
args[i++] = "read-tree";
|
|
|
|
if (verbose)
|
|
|
|
args[i++] = "-v";
|
|
|
|
args[i++] = "-m";
|
|
|
|
args[i++] = "-u";
|
|
|
|
args[i++] = EMPTY_TREE_SHA1_HEX;
|
|
|
|
args[i++] = sha1_to_hex(sha1);
|
|
|
|
args[i] = NULL;
|
|
|
|
|
|
|
|
if (run_command_v_opt(args, RUN_GIT_CMD))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("read-tree failed"));
|
2010-11-14 22:07:49 +00:00
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
static void reset_hard(unsigned const char *sha1, int verbose)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
const char *args[6];
|
|
|
|
|
|
|
|
args[i++] = "read-tree";
|
|
|
|
if (verbose)
|
|
|
|
args[i++] = "-v";
|
|
|
|
args[i++] = "--reset";
|
|
|
|
args[i++] = "-u";
|
|
|
|
args[i++] = sha1_to_hex(sha1);
|
|
|
|
args[i] = NULL;
|
|
|
|
|
|
|
|
if (run_command_v_opt(args, RUN_GIT_CMD))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("read-tree failed"));
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
static void restore_state(const struct object_id *head,
|
|
|
|
const struct object_id *stash)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
const char *args[] = { "stash", "apply", NULL, NULL };
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
if (is_null_oid(stash))
|
2008-07-07 17:24:20 +00:00
|
|
|
return;
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
reset_hard(head->hash, 1);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
args[2] = oid_to_hex(stash);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* It is OK to ignore error here, for example when there was
|
|
|
|
* nothing to restore.
|
|
|
|
*/
|
|
|
|
run_command_v_opt(args, RUN_GIT_CMD);
|
|
|
|
|
|
|
|
strbuf_release(&sb);
|
|
|
|
refresh_cache(REFRESH_QUIET);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is called when no merge was necessary. */
|
|
|
|
static void finish_up_to_date(const char *msg)
|
|
|
|
{
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0)
|
2011-02-22 23:41:59 +00:00
|
|
|
printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
|
2008-07-07 17:24:20 +00:00
|
|
|
drop_save();
|
|
|
|
}
|
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
static void squash_message(struct commit *commit, struct commit_list *remoteheads)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf out = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
struct commit_list *j;
|
2009-10-19 15:48:08 +00:00
|
|
|
struct pretty_print_context ctx = {0};
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Squash commit -- not updating HEAD\n"));
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
init_revisions(&rev, NULL);
|
|
|
|
rev.ignore_merges = 1;
|
|
|
|
rev.commit_format = CMIT_FMT_MEDIUM;
|
|
|
|
|
|
|
|
commit->object.flags |= UNINTERESTING;
|
|
|
|
add_pending_object(&rev, &commit->object, NULL);
|
|
|
|
|
|
|
|
for (j = remoteheads; j; j = j->next)
|
|
|
|
add_pending_object(&rev, &j->item->object, NULL);
|
|
|
|
|
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
|
|
|
if (prepare_revision_walk(&rev))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2009-10-19 15:48:08 +00:00
|
|
|
ctx.abbrev = rev.abbrev;
|
|
|
|
ctx.date_mode = rev.date_mode;
|
2011-05-26 22:27:49 +00:00
|
|
|
ctx.fmt = rev.commit_format;
|
2009-10-19 15:48:08 +00:00
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addstr(&out, "Squashed commit of the following:\n");
|
|
|
|
while ((commit = get_revision(&rev)) != NULL) {
|
|
|
|
strbuf_addch(&out, '\n');
|
|
|
|
strbuf_addf(&out, "commit %s\n",
|
2015-11-10 02:22:28 +00:00
|
|
|
oid_to_hex(&commit->object.oid));
|
2011-05-26 22:27:49 +00:00
|
|
|
pretty_print_commit(&ctx, commit, &out);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
2016-07-08 09:12:55 +00:00
|
|
|
write_file_buf(git_path_squash_msg(), out.buf, out.len);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_release(&out);
|
|
|
|
}
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
static void finish(struct commit *head_commit,
|
2012-04-16 23:15:13 +00:00
|
|
|
struct commit_list *remoteheads,
|
2017-02-21 23:47:28 +00:00
|
|
|
const struct object_id *new_head, const char *msg)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf reflog_message = STRBUF_INIT;
|
2017-02-21 23:47:28 +00:00
|
|
|
const struct object_id *head = &head_commit->object.oid;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
if (!msg)
|
|
|
|
strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION"));
|
|
|
|
else {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0)
|
|
|
|
printf("%s\n", msg);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addf(&reflog_message, "%s: %s",
|
|
|
|
getenv("GIT_REFLOG_ACTION"), msg);
|
|
|
|
}
|
|
|
|
if (squash) {
|
2012-04-16 23:15:13 +00:00
|
|
|
squash_message(head_commit, remoteheads);
|
2008-07-07 17:24:20 +00:00
|
|
|
} else {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0 && !merge_msg.len)
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("No merge message -- not updating HEAD\n"));
|
2008-07-07 17:24:20 +00:00
|
|
|
else {
|
|
|
|
const char *argv_gc_auto[] = { "gc", "--auto", NULL };
|
|
|
|
update_ref(reflog_message.buf, "HEAD",
|
2017-02-21 23:47:28 +00:00
|
|
|
new_head->hash, head->hash, 0,
|
2014-04-07 13:47:56 +00:00
|
|
|
UPDATE_REFS_DIE_ON_ERR);
|
2008-07-07 17:24:20 +00:00
|
|
|
/*
|
|
|
|
* We ignore errors in 'gc --auto', since the
|
|
|
|
* user should see them.
|
|
|
|
*/
|
2016-01-13 17:20:21 +00:00
|
|
|
close_all_packs();
|
2008-07-07 17:24:20 +00:00
|
|
|
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (new_head && show_diffstat) {
|
|
|
|
struct diff_options opts;
|
|
|
|
diff_setup(&opts);
|
2012-03-01 12:26:42 +00:00
|
|
|
opts.stat_width = -1; /* use full terminal width */
|
2012-03-01 12:26:46 +00:00
|
|
|
opts.stat_graph_width = -1; /* respect statGraphWidth config */
|
2008-07-07 17:24:20 +00:00
|
|
|
opts.output_format |=
|
|
|
|
DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
|
|
|
|
opts.detect_rename = DIFF_DETECT_RENAME;
|
2012-08-03 12:16:24 +00:00
|
|
|
diff_setup_done(&opts);
|
2017-05-30 17:31:03 +00:00
|
|
|
diff_tree_oid(head, new_head, "", &opts);
|
2008-07-07 17:24:20 +00:00
|
|
|
diffcore_std(&opts);
|
|
|
|
diff_flush(&opts);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Run a post-merge hook */
|
2014-03-18 10:00:53 +00:00
|
|
|
run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
strbuf_release(&reflog_message);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the name for the merge commit's message. */
|
|
|
|
static void merge_name(const char *remote, struct strbuf *msg)
|
|
|
|
{
|
2011-11-07 21:26:22 +00:00
|
|
|
struct commit *remote_head;
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id branch_head;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2009-02-14 07:26:12 +00:00
|
|
|
struct strbuf bname = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
const char *ptr;
|
merge: fix incorrect merge message for ambiguous tag/branch
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.
When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.
Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.
In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-09 10:02:24 +00:00
|
|
|
char *found_ref;
|
2008-07-07 17:24:20 +00:00
|
|
|
int len, early;
|
|
|
|
|
interpret_branch_name: allow callers to restrict expansions
The interpret_branch_name() function converts names like
@{-1} and @{upstream} into branch names. The expanded ref
names are not fully qualified, and may be outside of the
refs/heads/ namespace (e.g., "@" expands to "HEAD", and
"@{upstream}" is likely to be in "refs/remotes/").
This is OK for callers like dwim_ref() which are primarily
interested in resolving the resulting name, no matter where
it is. But callers like "git branch" treat the result as a
branch name in refs/heads/. When we expand to a ref outside
that namespace, the results are very confusing (e.g., "git
branch @" tries to create refs/heads/HEAD, which is
nonsense).
Callers can't know from the returned string how the
expansion happened (e.g., did the user really ask for a
branch named "HEAD", or did we do a bogus expansion?). One
fix would be to return some out-parameters describing the
types of expansion that occurred. This has the benefit that
the caller can generate precise error messages ("I
understood @{upstream} to mean origin/master, but that is a
remote tracking branch, so you cannot create it as a local
name").
However, out-parameters make the function interface somewhat
cumbersome. Instead, let's do the opposite: let the caller
tell us which elements to expand. That's easier to pass in,
and none of the callers give more precise error messages
than "@{upstream} isn't a valid branch name" anyway (which
should be sufficient).
The strbuf_branchname() function needs a similar parameter,
as most of the callers access interpret_branch_name()
through it.
We can break the callers down into two groups:
1. Callers that are happy with any kind of ref in the
result. We pass "0" here, so they continue to work
without restrictions. This includes merge_name(),
the reflog handling in add_pending_object_with_path(),
and substitute_branch_name(). This last is what powers
dwim_ref().
2. Callers that have funny corner cases (mostly in
git-branch and git-checkout). These need to make use of
the new parameter, but I've left them as "0" in this
patch, and will address them individually in follow-on
patches.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-02 08:23:01 +00:00
|
|
|
strbuf_branchname(&bname, remote, 0);
|
2009-03-21 20:17:30 +00:00
|
|
|
remote = bname.buf;
|
2009-02-14 07:26:12 +00:00
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
oidclr(&branch_head);
|
2011-11-07 21:26:22 +00:00
|
|
|
remote_head = get_merge_parent(remote);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!remote_head)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("'%s' does not point to a commit"), remote);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
if (dwim_ref(remote, strlen(remote), branch_head.hash, &found_ref) > 0) {
|
2013-11-30 20:55:40 +00:00
|
|
|
if (starts_with(found_ref, "refs/heads/")) {
|
merge: fix incorrect merge message for ambiguous tag/branch
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.
When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.
Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.
In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-09 10:02:24 +00:00
|
|
|
strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
|
2017-02-21 23:47:28 +00:00
|
|
|
oid_to_hex(&branch_head), remote);
|
merge: fix incorrect merge message for ambiguous tag/branch
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.
When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.
Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.
In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-09 10:02:24 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2013-11-30 20:55:40 +00:00
|
|
|
if (starts_with(found_ref, "refs/tags/")) {
|
2011-11-05 04:31:28 +00:00
|
|
|
strbuf_addf(msg, "%s\t\ttag '%s' of .\n",
|
2017-02-21 23:47:28 +00:00
|
|
|
oid_to_hex(&branch_head), remote);
|
2011-11-05 04:31:28 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2013-11-30 20:55:40 +00:00
|
|
|
if (starts_with(found_ref, "refs/remotes/")) {
|
2010-11-02 15:31:25 +00:00
|
|
|
strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
|
2017-02-21 23:47:28 +00:00
|
|
|
oid_to_hex(&branch_head), remote);
|
2009-08-09 10:02:51 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* See if remote matches <name>^^^.. or <name>~<number> */
|
|
|
|
for (len = 0, ptr = remote + strlen(remote);
|
|
|
|
remote < ptr && ptr[-1] == '^';
|
|
|
|
ptr--)
|
|
|
|
len++;
|
|
|
|
if (len)
|
|
|
|
early = 1;
|
|
|
|
else {
|
|
|
|
early = 0;
|
|
|
|
ptr = strrchr(remote, '~');
|
|
|
|
if (ptr) {
|
|
|
|
int seen_nonzero = 0;
|
|
|
|
|
|
|
|
len++; /* count ~ */
|
|
|
|
while (*++ptr && isdigit(*ptr)) {
|
|
|
|
seen_nonzero |= (*ptr != '0');
|
|
|
|
len++;
|
|
|
|
}
|
|
|
|
if (*ptr)
|
|
|
|
len = 0; /* not ...~<number> */
|
|
|
|
else if (seen_nonzero)
|
|
|
|
early = 1;
|
|
|
|
else if (len == 1)
|
|
|
|
early = 1; /* "name~" is "name~1"! */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (len) {
|
|
|
|
struct strbuf truname = STRBUF_INIT;
|
2015-04-23 21:37:13 +00:00
|
|
|
strbuf_addf(&truname, "refs/heads/%s", remote);
|
Fix merge name generation in "merge in C"
When merging an early part of a branch, e.g. "git merge xyzzy~20", we were
supposed to say "branch 'xyzzy' (early part)", but it incorrectly said
"branch 'refs/heads/xy' (early part)" instead.
The logic was supposed to first strip away "~20" part to make sure that
what follows "~" is a non-zero posint, prefix it with "refs/heads/" and
ask resolve_ref() if it is a ref. If it is, then we know xyzzy was a
branch, and we can give the correct message.
However, there were a few bugs. First of all, the logic to build this
"true branch refname" did not count the characters correctly. At this
point of the code, "len" is the number of trailing, non-name part of the
given extended SHA-1 expression given by the user, i.e. number of bytes in
"~20" in the above example.
In addition, the message forgot to skip "refs/heads/" it prefixed from the
output.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-30 08:12:19 +00:00
|
|
|
strbuf_setlen(&truname, truname.len - len);
|
2011-11-13 10:22:14 +00:00
|
|
|
if (ref_exists(truname.buf)) {
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addf(msg,
|
|
|
|
"%s\t\tbranch '%s'%s of .\n",
|
2016-06-24 23:09:22 +00:00
|
|
|
oid_to_hex(&remote_head->object.oid),
|
Fix merge name generation in "merge in C"
When merging an early part of a branch, e.g. "git merge xyzzy~20", we were
supposed to say "branch 'xyzzy' (early part)", but it incorrectly said
"branch 'refs/heads/xy' (early part)" instead.
The logic was supposed to first strip away "~20" part to make sure that
what follows "~" is a non-zero posint, prefix it with "refs/heads/" and
ask resolve_ref() if it is a ref. If it is, then we know xyzzy was a
branch, and we can give the correct message.
However, there were a few bugs. First of all, the logic to build this
"true branch refname" did not count the characters correctly. At this
point of the code, "len" is the number of trailing, non-name part of the
given extended SHA-1 expression given by the user, i.e. number of bytes in
"~20" in the above example.
In addition, the message forgot to skip "refs/heads/" it prefixed from the
output.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-30 08:12:19 +00:00
|
|
|
truname.buf + 11,
|
2008-07-07 17:24:20 +00:00
|
|
|
(early ? " (early part)" : ""));
|
2009-02-14 07:26:12 +00:00
|
|
|
strbuf_release(&truname);
|
|
|
|
goto cleanup;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
2015-04-23 21:37:13 +00:00
|
|
|
strbuf_release(&truname);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
2013-03-19 16:55:34 +00:00
|
|
|
|
|
|
|
if (remote_head->util) {
|
|
|
|
struct merge_remote_desc *desc;
|
|
|
|
desc = merge_remote_util(remote_head);
|
|
|
|
if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
|
|
|
|
strbuf_addf(msg, "%s\t\t%s '%s'\n",
|
2016-06-24 23:09:22 +00:00
|
|
|
oid_to_hex(&desc->obj->oid),
|
2013-03-19 16:55:34 +00:00
|
|
|
typename(desc->obj->type),
|
|
|
|
remote);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
|
2016-06-24 23:09:22 +00:00
|
|
|
oid_to_hex(&remote_head->object.oid), remote);
|
2009-02-14 07:26:12 +00:00
|
|
|
cleanup:
|
|
|
|
strbuf_release(&buf);
|
|
|
|
strbuf_release(&bname);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2011-05-05 00:42:51 +00:00
|
|
|
static void parse_branch_merge_options(char *bmo)
|
|
|
|
{
|
|
|
|
const char **argv;
|
|
|
|
int argc;
|
|
|
|
|
|
|
|
if (!bmo)
|
|
|
|
return;
|
|
|
|
argc = split_cmdline(bmo, &argv);
|
|
|
|
if (argc < 0)
|
2011-05-11 18:38:36 +00:00
|
|
|
die(_("Bad branch.%s.mergeoptions string: %s"), branch,
|
|
|
|
split_cmdline_strerror(argc));
|
2014-09-16 18:56:57 +00:00
|
|
|
REALLOC_ARRAY(argv, argc + 2);
|
2017-07-15 20:00:45 +00:00
|
|
|
MOVE_ARRAY(argv + 1, argv, argc + 1);
|
2011-05-05 00:42:51 +00:00
|
|
|
argc++;
|
|
|
|
argv[0] = "branch.*.mergeoptions";
|
|
|
|
parse_options(argc, argv, NULL, builtin_merge_options,
|
|
|
|
builtin_merge_usage, 0);
|
|
|
|
free(argv);
|
|
|
|
}
|
|
|
|
|
2008-07-23 23:09:35 +00:00
|
|
|
static int git_merge_config(const char *k, const char *v, void *cb)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2011-10-07 06:12:09 +00:00
|
|
|
int status;
|
|
|
|
|
2013-11-30 20:55:40 +00:00
|
|
|
if (branch && starts_with(k, "branch.") &&
|
|
|
|
starts_with(k + 7, branch) &&
|
2008-07-07 17:24:20 +00:00
|
|
|
!strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
|
2011-05-05 00:42:51 +00:00
|
|
|
free(branch_mergeoptions);
|
|
|
|
branch_mergeoptions = xstrdup(v);
|
|
|
|
return 0;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
|
|
|
|
show_diffstat = git_config_bool(k, v);
|
|
|
|
else if (!strcmp(k, "pull.twohead"))
|
|
|
|
return git_config_string(&pull_twohead, k, v);
|
|
|
|
else if (!strcmp(k, "pull.octopus"))
|
|
|
|
return git_config_string(&pull_octopus, k, v);
|
2010-08-05 11:32:41 +00:00
|
|
|
else if (!strcmp(k, "merge.renormalize"))
|
|
|
|
option_renormalize = git_config_bool(k, v);
|
2011-10-07 06:12:09 +00:00
|
|
|
else if (!strcmp(k, "merge.ff")) {
|
2017-08-07 18:20:49 +00:00
|
|
|
int boolval = git_parse_maybe_bool(v);
|
2011-05-06 19:27:05 +00:00
|
|
|
if (0 <= boolval) {
|
2013-07-02 14:47:57 +00:00
|
|
|
fast_forward = boolval ? FF_ALLOW : FF_NO;
|
2011-05-06 19:27:05 +00:00
|
|
|
} else if (v && !strcmp(v, "only")) {
|
2013-07-02 14:47:57 +00:00
|
|
|
fast_forward = FF_ONLY;
|
2011-05-06 19:27:05 +00:00
|
|
|
} /* do not barf on values from future versions of git */
|
|
|
|
return 0;
|
2011-03-24 06:48:24 +00:00
|
|
|
} else if (!strcmp(k, "merge.defaulttoupstream")) {
|
|
|
|
default_to_upstream = git_config_bool(k, v);
|
|
|
|
return 0;
|
2013-11-04 23:14:41 +00:00
|
|
|
} else if (!strcmp(k, "commit.gpgsign")) {
|
|
|
|
sign_commit = git_config_bool(k, v) ? "" : NULL;
|
|
|
|
return 0;
|
2010-09-08 17:59:54 +00:00
|
|
|
}
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 00:23:20 +00:00
|
|
|
|
2011-10-07 06:12:09 +00:00
|
|
|
status = fmt_merge_msg_config(k, v, cb);
|
2012-01-06 20:44:07 +00:00
|
|
|
if (status)
|
|
|
|
return status;
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 00:23:20 +00:00
|
|
|
status = git_gpg_config(k, v, NULL);
|
2011-10-07 06:12:09 +00:00
|
|
|
if (status)
|
|
|
|
return status;
|
2008-07-07 17:24:20 +00:00
|
|
|
return git_diff_ui_config(k, v, cb);
|
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
static int read_tree_trivial(struct object_id *common, struct object_id *head,
|
|
|
|
struct object_id *one)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
|
|
|
int i, nr_trees = 0;
|
|
|
|
struct tree *trees[MAX_UNPACK_TREES];
|
|
|
|
struct tree_desc t[MAX_UNPACK_TREES];
|
|
|
|
struct unpack_trees_options opts;
|
|
|
|
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
opts.head_idx = 2;
|
|
|
|
opts.src_index = &the_index;
|
|
|
|
opts.dst_index = &the_index;
|
|
|
|
opts.update = 1;
|
|
|
|
opts.verbose_update = 1;
|
|
|
|
opts.trivial_merges_only = 1;
|
|
|
|
opts.merge = 1;
|
2017-05-06 22:10:37 +00:00
|
|
|
trees[nr_trees] = parse_tree_indirect(common);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!trees[nr_trees++])
|
|
|
|
return -1;
|
2017-05-06 22:10:37 +00:00
|
|
|
trees[nr_trees] = parse_tree_indirect(head);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!trees[nr_trees++])
|
|
|
|
return -1;
|
2017-05-06 22:10:37 +00:00
|
|
|
trees[nr_trees] = parse_tree_indirect(one);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!trees[nr_trees++])
|
|
|
|
return -1;
|
|
|
|
opts.fn = threeway_merge;
|
|
|
|
cache_tree_free(&active_cache_tree);
|
|
|
|
for (i = 0; i < nr_trees; i++) {
|
|
|
|
parse_tree(trees[i]);
|
|
|
|
init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
|
|
|
|
}
|
|
|
|
if (unpack_trees(nr_trees, t, &opts))
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
static void write_tree_trivial(struct object_id *oid)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2017-02-21 23:47:28 +00:00
|
|
|
if (write_cache_as_tree(oid->hash, 0, NULL))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("git write-tree failed to write a tree"));
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2010-03-31 19:22:06 +00:00
|
|
|
static int try_merge_strategy(const char *strategy, struct commit_list *common,
|
2012-04-16 23:15:13 +00:00
|
|
|
struct commit_list *remoteheads,
|
2015-03-26 05:00:48 +00:00
|
|
|
struct commit *head)
|
2010-03-31 19:22:06 +00:00
|
|
|
{
|
2014-10-01 10:28:30 +00:00
|
|
|
static struct lock_file lock;
|
2015-03-26 05:00:48 +00:00
|
|
|
const char *head_arg = "HEAD";
|
2008-10-03 13:02:31 +00:00
|
|
|
|
2016-12-07 18:33:54 +00:00
|
|
|
hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
|
2008-10-03 13:02:31 +00:00
|
|
|
refresh_cache(REFRESH_QUIET);
|
|
|
|
if (active_cache_changed &&
|
2014-10-01 10:28:30 +00:00
|
|
|
write_locked_index(&the_index, &lock, COMMIT_LOCK))
|
2011-02-22 23:41:59 +00:00
|
|
|
return error(_("Unable to write index."));
|
2014-10-01 10:28:30 +00:00
|
|
|
rollback_lock_file(&lock);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2008-08-28 13:43:00 +00:00
|
|
|
if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
|
2010-03-31 19:22:06 +00:00
|
|
|
int clean, x;
|
2008-08-28 13:43:00 +00:00
|
|
|
struct commit *result;
|
|
|
|
struct commit_list *reversed = NULL;
|
|
|
|
struct merge_options o;
|
2010-03-31 19:22:06 +00:00
|
|
|
struct commit_list *j;
|
2008-08-28 13:43:00 +00:00
|
|
|
|
|
|
|
if (remoteheads->next) {
|
2011-02-22 23:41:59 +00:00
|
|
|
error(_("Not handling anything other than two heads merge."));
|
2008-08-28 13:43:00 +00:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
init_merge_options(&o);
|
|
|
|
if (!strcmp(strategy, "subtree"))
|
2008-07-01 05:18:57 +00:00
|
|
|
o.subtree_shift = "";
|
2009-11-26 02:23:55 +00:00
|
|
|
|
2010-08-05 11:32:41 +00:00
|
|
|
o.renormalize = option_renormalize;
|
2011-02-20 09:53:21 +00:00
|
|
|
o.show_rename_progress =
|
|
|
|
show_progress == -1 ? isatty(2) : show_progress;
|
2010-08-05 11:32:41 +00:00
|
|
|
|
2010-08-26 05:47:58 +00:00
|
|
|
for (x = 0; x < xopts_nr; x++)
|
|
|
|
if (parse_merge_opt(&o, xopts[x]))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("Unknown option for merge-recursive: -X%s"), xopts[x]);
|
2008-08-28 13:43:00 +00:00
|
|
|
|
|
|
|
o.branch1 = head_arg;
|
2011-11-07 21:26:22 +00:00
|
|
|
o.branch2 = merge_remote_util(remoteheads->item)->name;
|
2008-08-28 13:43:00 +00:00
|
|
|
|
|
|
|
for (j = common; j; j = j->next)
|
|
|
|
commit_list_insert(j->item, &reversed);
|
|
|
|
|
2016-12-07 18:33:54 +00:00
|
|
|
hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
|
2011-09-17 11:57:44 +00:00
|
|
|
clean = merge_recursive(&o, head,
|
2008-08-28 13:43:00 +00:00
|
|
|
remoteheads->item, reversed, &result);
|
prepare the builtins for a libified merge_recursive()
Previously, callers of merge_trees() or merge_recursive() expected that
code to die() with an error message. This used to be okay because we
called those commands from scripts, and had a chance to print out a
message in case the command failed fatally (read: with exit code 128).
As scripting incurs its own set of problems (portability, speed,
idiosyncrasies of different shells, limited data structures leading to
inefficient code), we are converting more and more of these scripts into
builtins, using library functions directly.
We already tried to use merge_recursive() directly in the builtin
git-am, for example. Unfortunately, we had to roll it back temporarily
because some of the code in merge-recursive.c still deemed it okay to
call die(), when the builtin am code really wanted to print out a useful
advice after the merge failed fatally. In the next commits, we want to
fix that.
The code touched by this commit expected merge_trees() to die() with
some useful message when there is an error condition, but merge_trees()
is going to be improved by converting all die() calls to return error()
instead (i.e. return value -1 after printing out the message as before),
so that the caller can react more flexibly.
This is a step to prepare for the version of merge_trees() that no
longer dies, even if we just imitate the previous behavior by calling
exit(128): this is what callers of e.g. `git merge` have come to expect.
Note that the callers of the sequencer (revert and cherry-pick) already
fail fast even for the return value -1; The only difference is that they
now get a chance to say "<command> failed".
A caller of merge_trees() might want handle error messages themselves
(or even suppress them). As this patch is already complex enough, we
leave that change for a later patch.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-26 16:06:02 +00:00
|
|
|
if (clean < 0)
|
|
|
|
exit(128);
|
2008-08-28 13:43:00 +00:00
|
|
|
if (active_cache_changed &&
|
2014-10-01 10:28:30 +00:00
|
|
|
write_locked_index(&the_index, &lock, COMMIT_LOCK))
|
2011-02-22 23:41:59 +00:00
|
|
|
die (_("unable to write %s"), get_index_file());
|
2014-10-01 10:28:30 +00:00
|
|
|
rollback_lock_file(&lock);
|
2008-08-28 13:43:00 +00:00
|
|
|
return clean ? 0 : 1;
|
|
|
|
} else {
|
2010-12-11 00:51:44 +00:00
|
|
|
return try_merge_command(strategy, xopts_nr, xopts,
|
|
|
|
common, head_arg, remoteheads);
|
2008-08-28 13:43:00 +00:00
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void count_diff_files(struct diff_queue_struct *q,
|
|
|
|
struct diff_options *opt, void *data)
|
|
|
|
{
|
|
|
|
int *count = data;
|
|
|
|
|
|
|
|
(*count) += q->nr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int count_unmerged_entries(void)
|
|
|
|
{
|
|
|
|
int i, ret = 0;
|
|
|
|
|
2009-12-18 06:23:54 +00:00
|
|
|
for (i = 0; i < active_nr; i++)
|
|
|
|
if (ce_stage(active_cache[i]))
|
2008-07-07 17:24:20 +00:00
|
|
|
ret++;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_strategies(const char *string, unsigned attr)
|
|
|
|
{
|
2016-08-05 21:01:35 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (string) {
|
|
|
|
struct string_list list = STRING_LIST_INIT_DUP;
|
|
|
|
struct string_list_item *item;
|
|
|
|
string_list_split(&list, string, ' ', -1);
|
|
|
|
for_each_string_list_item(item, &list)
|
|
|
|
append_strategy(get_strategy(item->string));
|
|
|
|
string_list_clear(&list, 0);
|
2008-07-07 17:24:20 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
|
|
|
|
if (all_strategy[i].attr & attr)
|
|
|
|
append_strategy(&all_strategy[i]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2011-10-08 18:39:52 +00:00
|
|
|
static void read_merge_msg(struct strbuf *msg)
|
2011-02-15 01:07:50 +00:00
|
|
|
{
|
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
|
|
|
const char *filename = git_path_merge_msg();
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_reset(msg);
|
2011-11-16 08:03:36 +00:00
|
|
|
if (strbuf_read_file(msg, filename, 0) < 0)
|
|
|
|
die_errno(_("Could not read from '%s'"), filename);
|
2011-02-15 01:07:50 +00:00
|
|
|
}
|
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
static void write_merge_state(struct commit_list *);
|
|
|
|
static void abort_commit(struct commit_list *remoteheads, const char *err_msg)
|
2011-02-15 01:07:50 +00:00
|
|
|
{
|
2011-10-08 18:39:52 +00:00
|
|
|
if (err_msg)
|
|
|
|
error("%s", err_msg);
|
|
|
|
fprintf(stderr,
|
|
|
|
_("Not committing merge; use 'git commit' to complete the merge.\n"));
|
2012-04-16 23:15:13 +00:00
|
|
|
write_merge_state(remoteheads);
|
2011-10-08 18:39:52 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-01-30 20:25:30 +00:00
|
|
|
static const char merge_editor_comment[] =
|
|
|
|
N_("Please enter a commit message to explain why this merge is necessary,\n"
|
|
|
|
"especially if it merges an updated upstream into a topic branch.\n"
|
|
|
|
"\n"
|
2013-01-16 19:18:48 +00:00
|
|
|
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
|
2012-01-30 20:25:30 +00:00
|
|
|
"the commit.\n");
|
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
static void prepare_to_commit(struct commit_list *remoteheads)
|
2011-10-08 18:39:52 +00:00
|
|
|
{
|
|
|
|
struct strbuf msg = STRBUF_INIT;
|
|
|
|
strbuf_addbuf(&msg, &merge_msg);
|
|
|
|
strbuf_addch(&msg, '\n');
|
2012-01-30 20:25:30 +00:00
|
|
|
if (0 < option_edit)
|
2013-01-16 19:18:48 +00:00
|
|
|
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
|
2016-07-08 09:12:55 +00:00
|
|
|
write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
|
2014-03-18 10:00:54 +00:00
|
|
|
if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
|
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
|
|
|
git_path_merge_msg(), "merge", NULL))
|
2013-01-02 18:42:50 +00:00
|
|
|
abort_commit(remoteheads, NULL);
|
2012-01-11 06:44:45 +00:00
|
|
|
if (0 < option_edit) {
|
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
|
|
|
if (launch_editor(git_path_merge_msg(), NULL, NULL))
|
2012-04-16 23:15:13 +00:00
|
|
|
abort_commit(remoteheads, NULL);
|
2011-10-08 18:39:52 +00:00
|
|
|
}
|
|
|
|
read_merge_msg(&msg);
|
2015-10-16 15:16:42 +00:00
|
|
|
strbuf_stripspace(&msg, 0 < option_edit);
|
2011-10-08 18:39:52 +00:00
|
|
|
if (!msg.len)
|
2012-04-16 23:15:13 +00:00
|
|
|
abort_commit(remoteheads, _("Empty commit message."));
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_release(&merge_msg);
|
|
|
|
strbuf_addbuf(&merge_msg, &msg);
|
|
|
|
strbuf_release(&msg);
|
2011-02-15 01:07:50 +00:00
|
|
|
}
|
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id result_tree, result_commit;
|
2014-07-10 09:41:40 +00:00
|
|
|
struct commit_list *parents, **pptr = &parents;
|
2016-04-10 06:13:40 +00:00
|
|
|
static struct lock_file lock;
|
|
|
|
|
2016-12-07 18:33:54 +00:00
|
|
|
hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
|
2016-04-10 06:13:40 +00:00
|
|
|
refresh_cache(REFRESH_QUIET);
|
|
|
|
if (active_cache_changed &&
|
|
|
|
write_locked_index(&the_index, &lock, COMMIT_LOCK))
|
|
|
|
return error(_("Unable to write index."));
|
|
|
|
rollback_lock_file(&lock);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
write_tree_trivial(&result_tree);
|
2011-02-22 23:42:02 +00:00
|
|
|
printf(_("Wonderful.\n"));
|
2014-07-10 09:41:40 +00:00
|
|
|
pptr = commit_list_append(head, pptr);
|
|
|
|
pptr = commit_list_append(remoteheads->item, pptr);
|
2012-04-16 23:15:13 +00:00
|
|
|
prepare_to_commit(remoteheads);
|
2017-02-21 23:47:28 +00:00
|
|
|
if (commit_tree(merge_msg.buf, merge_msg.len, result_tree.hash, parents,
|
|
|
|
result_commit.hash, NULL, sign_commit))
|
2011-12-15 13:47:21 +00:00
|
|
|
die(_("failed to write commit object"));
|
2017-02-21 23:47:28 +00:00
|
|
|
finish(head, remoteheads, &result_commit, "In-index merge");
|
2008-07-07 17:24:20 +00:00
|
|
|
drop_save();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
static int finish_automerge(struct commit *head,
|
2012-04-17 19:22:26 +00:00
|
|
|
int head_subsumed,
|
2011-09-17 11:57:44 +00:00
|
|
|
struct commit_list *common,
|
2012-04-16 23:15:13 +00:00
|
|
|
struct commit_list *remoteheads,
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id *result_tree,
|
2008-07-07 17:24:20 +00:00
|
|
|
const char *wt_strategy)
|
|
|
|
{
|
2012-04-17 19:22:26 +00:00
|
|
|
struct commit_list *parents = NULL;
|
2008-07-07 17:24:20 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id result_commit;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
free_commit_list(common);
|
2012-04-17 19:22:26 +00:00
|
|
|
parents = remoteheads;
|
2013-07-02 14:47:57 +00:00
|
|
|
if (!head_subsumed || fast_forward == FF_NO)
|
2011-09-17 11:57:44 +00:00
|
|
|
commit_list_insert(head, &parents);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addch(&merge_msg, '\n');
|
2012-04-16 23:15:13 +00:00
|
|
|
prepare_to_commit(remoteheads);
|
2017-02-21 23:47:28 +00:00
|
|
|
if (commit_tree(merge_msg.buf, merge_msg.len, result_tree->hash, parents,
|
|
|
|
result_commit.hash, NULL, sign_commit))
|
2011-12-15 13:47:21 +00:00
|
|
|
die(_("failed to write commit object"));
|
2011-05-25 19:43:59 +00:00
|
|
|
strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
|
2017-02-21 23:47:28 +00:00
|
|
|
finish(head, remoteheads, &result_commit, buf.buf);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_release(&buf);
|
|
|
|
drop_save();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-24 18:27:22 +00:00
|
|
|
static int suggest_conflicts(void)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
2011-11-16 08:03:36 +00:00
|
|
|
const char *filename;
|
2008-07-07 17:24:20 +00:00
|
|
|
FILE *fp;
|
2014-10-24 18:34:59 +00:00
|
|
|
struct strbuf msgbuf = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
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
|
|
|
filename = git_path_merge_msg();
|
2017-05-03 10:16:46 +00:00
|
|
|
fp = xfopen(filename, "a");
|
2014-10-24 18:34:59 +00:00
|
|
|
|
|
|
|
append_conflicts_hint(&msgbuf);
|
|
|
|
fputs(msgbuf.buf, fp);
|
2014-12-24 00:18:38 +00:00
|
|
|
strbuf_release(&msgbuf);
|
2008-07-07 17:24:20 +00:00
|
|
|
fclose(fp);
|
2009-12-04 08:20:48 +00:00
|
|
|
rerere(allow_rerere_auto);
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Automatic merge failed; "
|
|
|
|
"fix conflicts and then commit the result.\n"));
|
2008-07-07 17:24:20 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int evaluate_result(void)
|
|
|
|
{
|
|
|
|
int cnt = 0;
|
|
|
|
struct rev_info rev;
|
|
|
|
|
|
|
|
/* Check how many files differ. */
|
|
|
|
init_revisions(&rev, "");
|
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
|
|
|
rev.diffopt.output_format |=
|
|
|
|
DIFF_FORMAT_CALLBACK;
|
|
|
|
rev.diffopt.format_callback = count_diff_files;
|
|
|
|
rev.diffopt.format_callback_data = &cnt;
|
|
|
|
run_diff_files(&rev, 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check how many unmerged entries are
|
|
|
|
* there.
|
|
|
|
*/
|
|
|
|
cnt += count_unmerged_entries();
|
|
|
|
|
|
|
|
return cnt;
|
|
|
|
}
|
|
|
|
|
2011-03-24 06:48:24 +00:00
|
|
|
/*
|
2013-07-03 09:12:34 +00:00
|
|
|
* Pretend as if the user told us to merge with the remote-tracking
|
2011-03-24 06:48:24 +00:00
|
|
|
* branch we have for the upstream of the current branch
|
|
|
|
*/
|
|
|
|
static int setup_with_upstream(const char ***argv)
|
|
|
|
{
|
|
|
|
struct branch *branch = branch_get(NULL);
|
|
|
|
int i;
|
|
|
|
const char **args;
|
|
|
|
|
|
|
|
if (!branch)
|
2011-04-10 19:34:04 +00:00
|
|
|
die(_("No current branch."));
|
remote.c: drop "remote" pointer from "struct branch"
When we create each branch struct, we fill in the
"remote_name" field from the config, and then fill in the
actual "remote" field (with a "struct remote") based on that
name. However, it turns out that nobody really cares about
the latter field. The only two sites that access it at all
are:
1. git-merge, which uses it to notice when the branch does
not have a remote defined. But we can easily replace this
with looking at remote_name instead.
2. remote.c itself, when setting up the @{upstream} merge
config. But we don't need to save the "remote" in the
"struct branch" for that; we can just look it up for
the duration of the operation.
So there is no need to have both fields; they are redundant
with each other (the struct remote contains the name, or you
can look up the struct from the name). It would be nice to
simplify this, especially as we are going to add matching
pushremote config in a future patch (and it would be nice to
keep them consistent).
So which one do we keep and which one do we get rid of?
If we had a lot of callers accessing the struct, it would be
more efficient to keep it (since you have to do a lookup to
go from the name to the struct, but not vice versa). But we
don't have a lot of callers; we have exactly one, so
efficiency doesn't matter. We can decide this based on
simplicity and readability.
And the meaning of the struct value is somewhat unclear. Is
it always the remote matching remote_name? If remote_name is
NULL (i.e., no per-branch config), does the struct fall back
to the "origin" remote, or is it also NULL? These questions
will get even more tricky with pushremotes, whose fallback
behavior is more complicated. So let's just store the name,
which pretty clearly represents the branch.*.remote config.
Any lookup or fallback behavior can then be implemented in
helper functions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-05-21 04:45:13 +00:00
|
|
|
if (!branch->remote_name)
|
2011-04-10 19:34:04 +00:00
|
|
|
die(_("No remote for the current branch."));
|
2011-03-24 06:48:24 +00:00
|
|
|
if (!branch->merge_nr)
|
2011-04-10 19:34:04 +00:00
|
|
|
die(_("No default upstream defined for the current branch."));
|
2011-03-24 06:48:24 +00:00
|
|
|
|
2016-02-22 22:44:35 +00:00
|
|
|
args = xcalloc(st_add(branch->merge_nr, 1), sizeof(char *));
|
2011-03-24 06:48:24 +00:00
|
|
|
for (i = 0; i < branch->merge_nr; i++) {
|
|
|
|
if (!branch->merge[i]->dst)
|
2013-07-03 09:12:34 +00:00
|
|
|
die(_("No remote-tracking branch for %s from %s"),
|
2011-03-24 06:48:24 +00:00
|
|
|
branch->merge[i]->src, branch->remote_name);
|
|
|
|
args[i] = branch->merge[i]->dst;
|
|
|
|
}
|
|
|
|
args[i] = NULL;
|
|
|
|
*argv = args;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
static void write_merge_state(struct commit_list *remoteheads)
|
2011-10-08 18:39:52 +00:00
|
|
|
{
|
|
|
|
struct commit_list *j;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
2011-11-07 22:45:10 +00:00
|
|
|
for (j = remoteheads; j; j = j->next) {
|
2015-11-10 02:22:28 +00:00
|
|
|
struct object_id *oid;
|
2011-11-07 22:45:10 +00:00
|
|
|
struct commit *c = j->item;
|
|
|
|
if (c->util && merge_remote_util(c)->obj) {
|
2015-11-10 02:22:28 +00:00
|
|
|
oid = &merge_remote_util(c)->obj->oid;
|
2011-11-07 22:45:10 +00:00
|
|
|
} else {
|
2015-11-10 02:22:28 +00:00
|
|
|
oid = &c->object.oid;
|
2011-11-07 22:45:10 +00:00
|
|
|
}
|
2015-11-10 02:22:28 +00:00
|
|
|
strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
|
2011-11-07 22:45:10 +00:00
|
|
|
}
|
2016-07-08 09:12:55 +00:00
|
|
|
write_file_buf(git_path_merge_head(), buf.buf, buf.len);
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_addch(&merge_msg, '\n');
|
2016-07-08 09:12:55 +00:00
|
|
|
write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len);
|
2011-11-16 08:03:36 +00:00
|
|
|
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_reset(&buf);
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward == FF_NO)
|
2016-09-15 18:31:00 +00:00
|
|
|
strbuf_addstr(&buf, "no-ff");
|
2016-07-08 09:12:55 +00:00
|
|
|
write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
|
2011-10-08 18:39:52 +00:00
|
|
|
}
|
|
|
|
|
2012-01-11 06:44:45 +00:00
|
|
|
static int default_edit_option(void)
|
|
|
|
{
|
|
|
|
static const char name[] = "GIT_MERGE_AUTOEDIT";
|
|
|
|
const char *e = getenv(name);
|
|
|
|
struct stat st_stdin, st_stdout;
|
|
|
|
|
|
|
|
if (have_message)
|
|
|
|
/* an explicit -m msg without --[no-]edit */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (e) {
|
2017-08-07 18:20:49 +00:00
|
|
|
int v = git_parse_maybe_bool(e);
|
2012-01-11 06:44:45 +00:00
|
|
|
if (v < 0)
|
2016-06-17 20:21:17 +00:00
|
|
|
die(_("Bad value '%s' in environment '%s'"), e, name);
|
2012-01-11 06:44:45 +00:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Use editor if stdin and stdout are the same and is a tty */
|
|
|
|
return (!fstat(0, &st_stdin) &&
|
|
|
|
!fstat(1, &st_stdout) &&
|
2012-02-23 19:24:44 +00:00
|
|
|
isatty(0) && isatty(1) &&
|
2012-01-11 06:44:45 +00:00
|
|
|
st_stdin.st_dev == st_stdout.st_dev &&
|
|
|
|
st_stdin.st_ino == st_stdout.st_ino &&
|
|
|
|
st_stdin.st_mode == st_stdout.st_mode);
|
|
|
|
}
|
|
|
|
|
2015-04-25 19:00:14 +00:00
|
|
|
static struct commit_list *reduce_parents(struct commit *head_commit,
|
|
|
|
int *head_subsumed,
|
|
|
|
struct commit_list *remoteheads)
|
2012-04-17 18:31:10 +00:00
|
|
|
{
|
2015-10-24 16:21:31 +00:00
|
|
|
struct commit_list *parents, **remotes;
|
2012-04-17 18:31:10 +00:00
|
|
|
|
2015-04-25 17:25:43 +00:00
|
|
|
/*
|
|
|
|
* Is the current HEAD reachable from another commit being
|
|
|
|
* merged? If so we do not want to record it as a parent of
|
|
|
|
* the resulting merge, unless --no-ff is given. We will flip
|
|
|
|
* this variable to 0 when we find HEAD among the independent
|
|
|
|
* tips being merged.
|
|
|
|
*/
|
|
|
|
*head_subsumed = 1;
|
2012-04-17 19:22:26 +00:00
|
|
|
|
2015-04-25 17:25:43 +00:00
|
|
|
/* Find what parents to record by checking independent ones. */
|
2012-04-17 19:22:26 +00:00
|
|
|
parents = reduce_heads(remoteheads);
|
|
|
|
|
2015-10-24 16:21:31 +00:00
|
|
|
remoteheads = NULL;
|
|
|
|
remotes = &remoteheads;
|
|
|
|
while (parents) {
|
|
|
|
struct commit *commit = pop_commit(&parents);
|
2012-04-17 19:22:26 +00:00
|
|
|
if (commit == head_commit)
|
|
|
|
*head_subsumed = 0;
|
|
|
|
else
|
|
|
|
remotes = &commit_list_insert(commit, remotes)->next;
|
|
|
|
}
|
2012-04-17 18:31:10 +00:00
|
|
|
return remoteheads;
|
|
|
|
}
|
2012-01-11 06:44:45 +00:00
|
|
|
|
2015-04-26 01:29:44 +00:00
|
|
|
static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *merge_msg)
|
|
|
|
{
|
|
|
|
struct fmt_merge_msg_opts opts;
|
|
|
|
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
opts.add_title = !have_message;
|
|
|
|
opts.shortlog_len = shortlog_len;
|
|
|
|
opts.credit_people = (0 < option_edit);
|
|
|
|
|
|
|
|
fmt_merge_msg(merge_names, merge_msg, &opts);
|
|
|
|
if (merge_msg->len)
|
|
|
|
strbuf_setlen(merge_msg, merge_msg->len - 1);
|
|
|
|
}
|
|
|
|
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge_names)
|
|
|
|
{
|
|
|
|
const char *filename;
|
|
|
|
int fd, pos, npos;
|
|
|
|
struct strbuf fetch_head_file = STRBUF_INIT;
|
|
|
|
|
|
|
|
if (!merge_names)
|
|
|
|
merge_names = &fetch_head_file;
|
|
|
|
|
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
|
|
|
filename = git_path_fetch_head();
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
fd = open(filename, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
die_errno(_("could not open '%s' for reading"), filename);
|
|
|
|
|
|
|
|
if (strbuf_read(merge_names, fd, 0) < 0)
|
|
|
|
die_errno(_("could not read '%s'"), filename);
|
|
|
|
if (close(fd) < 0)
|
|
|
|
die_errno(_("could not close '%s'"), filename);
|
|
|
|
|
|
|
|
for (pos = 0; pos < merge_names->len; pos = npos) {
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id oid;
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
char *ptr;
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
ptr = strchr(merge_names->buf + pos, '\n');
|
|
|
|
if (ptr)
|
|
|
|
npos = ptr - merge_names->buf + 1;
|
|
|
|
else
|
|
|
|
npos = merge_names->len;
|
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
if (npos - pos < GIT_SHA1_HEXSZ + 2 ||
|
|
|
|
get_oid_hex(merge_names->buf + pos, &oid))
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
commit = NULL; /* bad */
|
2017-02-21 23:47:28 +00:00
|
|
|
else if (memcmp(merge_names->buf + pos + GIT_SHA1_HEXSZ, "\t\t", 2))
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
continue; /* not-for-merge */
|
|
|
|
else {
|
2017-02-21 23:47:28 +00:00
|
|
|
char saved = merge_names->buf[pos + GIT_SHA1_HEXSZ];
|
|
|
|
merge_names->buf[pos + GIT_SHA1_HEXSZ] = '\0';
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
commit = get_merge_parent(merge_names->buf + pos);
|
2017-02-21 23:47:28 +00:00
|
|
|
merge_names->buf[pos + GIT_SHA1_HEXSZ] = saved;
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
}
|
|
|
|
if (!commit) {
|
|
|
|
if (ptr)
|
|
|
|
*ptr = '\0';
|
2016-06-17 20:21:17 +00:00
|
|
|
die(_("not something we can merge in %s: %s"),
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
filename, merge_names->buf + pos);
|
|
|
|
}
|
|
|
|
remotes = &commit_list_insert(commit, remotes)->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (merge_names == &fetch_head_file)
|
|
|
|
strbuf_release(&fetch_head_file);
|
|
|
|
}
|
|
|
|
|
2015-04-25 19:00:14 +00:00
|
|
|
static struct commit_list *collect_parents(struct commit *head_commit,
|
|
|
|
int *head_subsumed,
|
2015-04-26 01:34:22 +00:00
|
|
|
int argc, const char **argv,
|
|
|
|
struct strbuf *merge_msg)
|
2015-04-25 19:00:14 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct commit_list *remoteheads = NULL;
|
|
|
|
struct commit_list **remotes = &remoteheads;
|
2015-04-26 01:39:43 +00:00
|
|
|
struct strbuf merge_names = STRBUF_INIT, *autogen = NULL;
|
|
|
|
|
|
|
|
if (merge_msg && (!have_message || shortlog_len))
|
|
|
|
autogen = &merge_names;
|
2015-04-25 19:00:14 +00:00
|
|
|
|
|
|
|
if (head_commit)
|
|
|
|
remotes = &commit_list_insert(head_commit, remotes)->next;
|
|
|
|
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
if (argc == 1 && !strcmp(argv[0], "FETCH_HEAD")) {
|
|
|
|
handle_fetch_head(remotes, autogen);
|
|
|
|
remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
struct commit *commit = get_merge_parent(argv[i]);
|
|
|
|
if (!commit)
|
|
|
|
help_unknown_ref(argv[i], "merge",
|
2016-06-17 20:21:17 +00:00
|
|
|
_("not something we can merge"));
|
merge: handle FETCH_HEAD internally
The collect_parents() function now is responsible for
1. parsing the commits given on the command line into a list of
commits to be merged;
2. filtering these parents into independent ones; and
3. optionally calling fmt_merge_msg() via prepare_merge_message()
to prepare an auto-generated merge log message, using fake
contents that FETCH_HEAD would have had if these commits were
fetched from the current repository with "git pull . $args..."
Make "git merge FETCH_HEAD" to be the same as the traditional
git merge "$(git fmt-merge-msg <.git/FETCH_HEAD)" $commits
invocation of the command in "git pull", where $commits are the ones
that appear in FETCH_HEAD that are not marked as not-for-merge, by
making it do a bit more, specifically:
- noticing "FETCH_HEAD" is the only "commit" on the command line
and picking the commits that are not marked as not-for-merge as
the list of commits to be merged (substitute for step #1 above);
- letting the resulting list fed to step #2 above;
- doing the step #3 above, using the contents of the FETCH_HEAD
instead of fake contents crafted from the list of commits parsed
in the step #1 above.
Note that this changes the semantics. "git merge FETCH_HEAD" has
always behaved as if the first commit in the FETCH_HEAD file were
directly specified on the command line, creating a two-way merge
whose auto-generated merge log said "merge commit xyz". With this
change, if the previous fetch was to grab multiple branches (e.g.
"git fetch $there topic-a topic-b"), the new world order is to
create an octopus, behaving as if "git pull $there topic-a topic-b"
were run. This is a deliberate change to make that happen, and
can be seen in the changes to t3033 tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-26 01:47:21 +00:00
|
|
|
remotes = &commit_list_insert(commit, remotes)->next;
|
|
|
|
}
|
|
|
|
remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
|
|
|
|
if (autogen) {
|
|
|
|
struct commit_list *p;
|
|
|
|
for (p = remoteheads; p; p = p->next)
|
|
|
|
merge_name(merge_remote_util(p->item)->name, autogen);
|
|
|
|
}
|
|
|
|
}
|
2015-04-26 01:34:22 +00:00
|
|
|
|
2015-04-26 01:39:43 +00:00
|
|
|
if (autogen) {
|
|
|
|
prepare_merge_message(autogen, merge_msg);
|
|
|
|
strbuf_release(autogen);
|
2015-04-26 01:34:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return remoteheads;
|
2015-04-25 19:00:14 +00:00
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
int cmd_merge(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id result_tree, stash, head_oid;
|
2011-09-17 11:57:44 +00:00
|
|
|
struct commit *head_commit;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2016-04-07 19:03:06 +00:00
|
|
|
int i, ret = 0, head_subsumed;
|
2008-07-07 17:24:20 +00:00
|
|
|
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
|
|
|
|
struct commit_list *common = NULL;
|
|
|
|
const char *best_strategy = NULL, *wt_strategy = NULL;
|
2012-04-17 18:31:10 +00:00
|
|
|
struct commit_list *remoteheads, *p;
|
2011-12-13 14:17:48 +00:00
|
|
|
void *branch_to_free;
|
2016-12-14 08:37:55 +00:00
|
|
|
int orig_argc = argc;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2010-10-22 06:49:45 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage_with_options(builtin_merge_usage, builtin_merge_options);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we are _not_ on a detached HEAD, i.e. if there is a
|
|
|
|
* current branch.
|
|
|
|
*/
|
2017-02-21 23:47:28 +00:00
|
|
|
branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
|
2017-08-10 16:47:55 +00:00
|
|
|
if (branch)
|
|
|
|
skip_prefix(branch, "refs/heads/", &branch);
|
2017-02-21 23:47:28 +00:00
|
|
|
if (!branch || is_null_oid(&head_oid))
|
2011-09-17 11:57:44 +00:00
|
|
|
head_commit = NULL;
|
2011-09-17 11:57:45 +00:00
|
|
|
else
|
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
|
|
|
head_commit = lookup_commit_or_die(&head_oid, "HEAD");
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2016-02-25 08:59:21 +00:00
|
|
|
init_diff_ui_defaults();
|
2008-07-07 17:24:20 +00:00
|
|
|
git_config(git_merge_config, NULL);
|
|
|
|
|
2011-05-05 00:42:51 +00:00
|
|
|
if (branch_mergeoptions)
|
|
|
|
parse_branch_merge_options(branch_mergeoptions);
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_merge_options,
|
2008-07-07 17:24:20 +00:00
|
|
|
builtin_merge_usage, 0);
|
2011-10-07 06:12:09 +00:00
|
|
|
if (shortlog_len < 0)
|
|
|
|
shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
|
2010-11-09 21:49:58 +00:00
|
|
|
|
2011-02-20 09:53:21 +00:00
|
|
|
if (verbosity < 0 && show_progress == -1)
|
|
|
|
show_progress = 0;
|
|
|
|
|
2010-11-09 21:49:59 +00:00
|
|
|
if (abort_current_merge) {
|
|
|
|
int nargc = 2;
|
|
|
|
const char *nargv[] = {"reset", "--merge", NULL};
|
|
|
|
|
2016-12-14 08:37:57 +00:00
|
|
|
if (orig_argc != 2)
|
2016-12-15 17:43:46 +00:00
|
|
|
usage_msg_opt(_("--abort expects no arguments"),
|
2016-12-14 08:37:57 +00:00
|
|
|
builtin_merge_usage, builtin_merge_options);
|
|
|
|
|
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
|
|
|
if (!file_exists(git_path_merge_head()))
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("There is no merge to abort (MERGE_HEAD missing)."));
|
2010-11-09 21:49:59 +00:00
|
|
|
|
|
|
|
/* Invoke 'git reset --merge' */
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = cmd_reset(nargc, nargv, prefix);
|
|
|
|
goto done;
|
2010-11-09 21:49:59 +00:00
|
|
|
}
|
|
|
|
|
2016-12-14 08:37:55 +00:00
|
|
|
if (continue_current_merge) {
|
|
|
|
int nargc = 1;
|
|
|
|
const char *nargv[] = {"commit", NULL};
|
|
|
|
|
|
|
|
if (orig_argc != 2)
|
2016-12-15 17:43:46 +00:00
|
|
|
usage_msg_opt(_("--continue expects no arguments"),
|
2016-12-14 08:37:55 +00:00
|
|
|
builtin_merge_usage, builtin_merge_options);
|
|
|
|
|
|
|
|
if (!file_exists(git_path_merge_head()))
|
|
|
|
die(_("There is no merge in progress (MERGE_HEAD missing)."));
|
|
|
|
|
|
|
|
/* Invoke 'git commit' */
|
|
|
|
ret = cmd_commit(nargc, nargv, prefix);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2010-11-09 21:49:58 +00:00
|
|
|
if (read_cache_unmerged())
|
|
|
|
die_resolve_conflict("merge");
|
|
|
|
|
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
|
|
|
if (file_exists(git_path_merge_head())) {
|
2010-11-09 21:49:58 +00:00
|
|
|
/*
|
|
|
|
* There is no unmerged entry, don't advise 'git
|
|
|
|
* add/rm <file>', just 'git commit'.
|
|
|
|
*/
|
|
|
|
if (advice_resolve_conflict)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
|
2014-08-30 19:56:01 +00:00
|
|
|
"Please, commit your changes before you merge."));
|
2010-11-09 21:49:58 +00:00
|
|
|
else
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("You have not concluded your merge (MERGE_HEAD exists)."));
|
2010-11-09 21:49:58 +00:00
|
|
|
}
|
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
|
|
|
if (file_exists(git_path_cherry_pick_head())) {
|
2011-02-20 04:12:27 +00:00
|
|
|
if (advice_resolve_conflict)
|
2011-04-10 19:34:05 +00:00
|
|
|
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
2014-08-30 19:56:01 +00:00
|
|
|
"Please, commit your changes before you merge."));
|
2011-02-20 04:12:27 +00:00
|
|
|
else
|
2011-04-10 19:34:05 +00:00
|
|
|
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
|
2010-11-09 21:49:58 +00:00
|
|
|
}
|
|
|
|
resolve_undo_clear();
|
|
|
|
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity < 0)
|
|
|
|
show_diffstat = 0;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
if (squash) {
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward == FF_NO)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("You cannot combine --squash with --no-ff."));
|
2008-07-07 17:24:20 +00:00
|
|
|
option_commit = 0;
|
|
|
|
}
|
|
|
|
|
2015-04-23 20:01:44 +00:00
|
|
|
if (!argc) {
|
|
|
|
if (default_to_upstream)
|
|
|
|
argc = setup_with_upstream(&argv);
|
|
|
|
else
|
|
|
|
die(_("No commit specified and merge.defaultToUpstream not set."));
|
|
|
|
} else if (argc == 1 && !strcmp(argv[0], "-")) {
|
|
|
|
argv[0] = "@{-1}";
|
2011-04-07 22:57:57 +00:00
|
|
|
}
|
2015-04-23 20:01:44 +00:00
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!argc)
|
|
|
|
usage_with_options(builtin_merge_usage,
|
|
|
|
builtin_merge_options);
|
|
|
|
|
2015-04-23 20:46:44 +00:00
|
|
|
if (!head_commit) {
|
2008-07-07 17:24:20 +00:00
|
|
|
/*
|
|
|
|
* If the merged head is a valid one there is no reason
|
|
|
|
* to forbid "git merge" into a branch yet to be born.
|
|
|
|
* We do the same for "git pull".
|
|
|
|
*/
|
2017-02-21 23:47:28 +00:00
|
|
|
struct object_id *remote_head_oid;
|
2008-08-21 12:14:18 +00:00
|
|
|
if (squash)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("Squash commit into empty head not supported yet"));
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward == FF_NO)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("Non-fast-forward commit does not make sense into "
|
|
|
|
"an empty head"));
|
2015-04-26 01:34:22 +00:00
|
|
|
remoteheads = collect_parents(head_commit, &head_subsumed,
|
|
|
|
argc, argv, NULL);
|
2016-03-21 19:01:43 +00:00
|
|
|
if (!remoteheads)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("%s - not something we can merge"), argv[0]);
|
2015-04-23 20:56:34 +00:00
|
|
|
if (remoteheads->next)
|
|
|
|
die(_("Can merge only exactly one commit into empty head"));
|
2017-02-21 23:47:28 +00:00
|
|
|
remote_head_oid = &remoteheads->item->object.oid;
|
|
|
|
read_empty(remote_head_oid->hash, 0);
|
|
|
|
update_ref("initial pull", "HEAD", remote_head_oid->hash,
|
2014-04-07 13:47:56 +00:00
|
|
|
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
2015-04-23 20:46:44 +00:00
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2015-04-23 20:46:44 +00:00
|
|
|
/*
|
2015-03-26 05:00:48 +00:00
|
|
|
* All the rest are the commits being merged; prepare
|
|
|
|
* the standard merge summary message to be appended
|
|
|
|
* to the given message.
|
2015-04-23 20:46:44 +00:00
|
|
|
*/
|
2015-03-26 05:00:48 +00:00
|
|
|
remoteheads = collect_parents(head_commit, &head_subsumed,
|
|
|
|
argc, argv, &merge_msg);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
if (!head_commit || !argc)
|
2008-07-07 17:24:20 +00:00
|
|
|
usage_with_options(builtin_merge_usage,
|
|
|
|
builtin_merge_options);
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
if (verify_signatures) {
|
|
|
|
for (p = remoteheads; p; p = p->next) {
|
|
|
|
struct commit *commit = p->item;
|
2017-03-26 16:01:24 +00:00
|
|
|
char hex[GIT_MAX_HEXSZ + 1];
|
2013-03-31 16:02:24 +00:00
|
|
|
struct signature_check signature_check;
|
|
|
|
memset(&signature_check, 0, sizeof(signature_check));
|
|
|
|
|
|
|
|
check_commit_signature(commit, &signature_check);
|
|
|
|
|
2015-11-10 02:22:29 +00:00
|
|
|
find_unique_abbrev_r(hex, commit->object.oid.hash, DEFAULT_ABBREV);
|
2013-03-31 16:02:24 +00:00
|
|
|
switch (signature_check.result) {
|
|
|
|
case 'G':
|
|
|
|
break;
|
2013-03-31 16:02:46 +00:00
|
|
|
case 'U':
|
|
|
|
die(_("Commit %s has an untrusted GPG signature, "
|
|
|
|
"allegedly by %s."), hex, signature_check.signer);
|
2013-03-31 16:02:24 +00:00
|
|
|
case 'B':
|
|
|
|
die(_("Commit %s has a bad GPG signature "
|
|
|
|
"allegedly by %s."), hex, signature_check.signer);
|
|
|
|
default: /* 'N' */
|
|
|
|
die(_("Commit %s does not have a GPG signature."), hex);
|
|
|
|
}
|
|
|
|
if (verbosity >= 0 && signature_check.result == 'G')
|
|
|
|
printf(_("Commit %s has a good GPG signature by %s\n"),
|
|
|
|
hex, signature_check.signer);
|
|
|
|
|
2014-06-23 07:05:47 +00:00
|
|
|
signature_check_clear(&signature_check);
|
2013-03-31 16:02:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addstr(&buf, "merge");
|
2012-04-17 18:31:10 +00:00
|
|
|
for (p = remoteheads; p; p = p->next)
|
|
|
|
strbuf_addf(&buf, " %s", merge_remote_util(p->item)->name);
|
2008-07-07 17:24:20 +00:00
|
|
|
setenv("GIT_REFLOG_ACTION", buf.buf, 0);
|
|
|
|
strbuf_reset(&buf);
|
|
|
|
|
2012-04-17 18:31:10 +00:00
|
|
|
for (p = remoteheads; p; p = p->next) {
|
|
|
|
struct commit *commit = p->item;
|
2011-11-07 21:26:22 +00:00
|
|
|
strbuf_addf(&buf, "GITHEAD_%s",
|
2016-06-24 23:09:22 +00:00
|
|
|
oid_to_hex(&commit->object.oid));
|
2012-04-17 18:31:10 +00:00
|
|
|
setenv(buf.buf, merge_remote_util(commit)->name, 1);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_reset(&buf);
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward != FF_ONLY &&
|
merge: do not create a signed tag merge under --ff-only option
Starting at release v1.7.9, if you ask to merge a signed tag, "git merge"
always creates a merge commit, even when the tag points at a commit that
happens to be a descendant of your current commit.
Unfortunately, this interacts rather badly for people who use --ff-only to
make sure that their branch is free of local developments. It used to be
possible to say:
$ git checkout -b frotz v1.7.9~30
$ git merge --ff-only v1.7.9
and expect that the resulting tip of frotz branch matches v1.7.9^0 (aka
the commit tagged as v1.7.9), but this fails with the updated Git with:
fatal: Not possible to fast-forward, aborting.
because a merge that merges v1.7.9 tag to v1.7.9~30 cannot be created by
fast forwarding.
We could teach users that now they have to do
$ git merge --ff-only v1.7.9^0
but it is far more pleasant for users if we DWIMmed this ourselves.
When an integrator pulls in a topic from a lieutenant via a signed tag,
even when the work done by the lieutenant happens to fast-forward, the
integrator wants to have a merge record, so the integrator will not be
asking for --ff-only when running "git pull" in such a case. Therefore,
this change should not regress the support for the use case v1.7.9 wanted
to add.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-06 00:22:12 +00:00
|
|
|
merge_remote_util(commit) &&
|
2011-11-08 00:29:34 +00:00
|
|
|
merge_remote_util(commit)->obj &&
|
2012-04-02 20:09:21 +00:00
|
|
|
merge_remote_util(commit)->obj->type == OBJ_TAG)
|
2013-07-02 14:47:57 +00:00
|
|
|
fast_forward = FF_NO;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2012-01-11 06:44:45 +00:00
|
|
|
if (option_edit < 0)
|
|
|
|
option_edit = default_edit_option();
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!use_strategies) {
|
2012-04-17 19:22:26 +00:00
|
|
|
if (!remoteheads)
|
|
|
|
; /* already up-to-date */
|
|
|
|
else if (!remoteheads->next)
|
2008-07-07 17:24:20 +00:00
|
|
|
add_strategies(pull_twohead, DEFAULT_TWOHEAD);
|
|
|
|
else
|
|
|
|
add_strategies(pull_octopus, DEFAULT_OCTOPUS);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < use_strategies_nr; i++) {
|
|
|
|
if (use_strategies[i]->attr & NO_FAST_FORWARD)
|
2013-07-02 14:47:57 +00:00
|
|
|
fast_forward = FF_NO;
|
2008-07-07 17:24:20 +00:00
|
|
|
if (use_strategies[i]->attr & NO_TRIVIAL)
|
|
|
|
allow_trivial = 0;
|
|
|
|
}
|
|
|
|
|
2012-04-17 19:22:26 +00:00
|
|
|
if (!remoteheads)
|
|
|
|
; /* already up-to-date */
|
|
|
|
else if (!remoteheads->next)
|
2014-10-30 19:20:44 +00:00
|
|
|
common = get_merge_bases(head_commit, remoteheads->item);
|
2008-07-07 17:24:20 +00:00
|
|
|
else {
|
|
|
|
struct commit_list *list = remoteheads;
|
2011-09-17 11:57:44 +00:00
|
|
|
commit_list_insert(head_commit, &list);
|
2008-07-07 17:24:20 +00:00
|
|
|
common = get_octopus_merge_bases(list);
|
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
2015-11-10 02:22:29 +00:00
|
|
|
update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash,
|
2014-04-07 13:47:56 +00:00
|
|
|
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 20:21:09 +00:00
|
|
|
if (remoteheads && !common) {
|
|
|
|
/* No common ancestors found. */
|
|
|
|
if (!allow_unrelated_histories)
|
|
|
|
die(_("refusing to merge unrelated histories"));
|
|
|
|
/* otherwise, we need a real merge. */
|
|
|
|
} else if (!remoteheads ||
|
2012-04-17 19:22:26 +00:00
|
|
|
(!remoteheads->next && !common->next &&
|
|
|
|
common->item == remoteheads->item)) {
|
2008-07-07 17:24:20 +00:00
|
|
|
/*
|
|
|
|
* If head can reach all the merge then we are up to date.
|
|
|
|
* but first the most common case of merging one remote.
|
|
|
|
*/
|
2016-06-17 20:21:17 +00:00
|
|
|
finish_up_to_date(_("Already up-to-date."));
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
2013-07-02 14:47:57 +00:00
|
|
|
} else if (fast_forward != FF_NO && !remoteheads->next &&
|
2008-07-07 17:24:20 +00:00
|
|
|
!common->next &&
|
2016-06-24 23:09:22 +00:00
|
|
|
!oidcmp(&common->item->object.oid, &head_commit->object.oid)) {
|
2008-07-07 17:24:20 +00:00
|
|
|
/* Again the most common case of merging one remote. */
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf msg = STRBUF_INIT;
|
2011-11-07 21:26:22 +00:00
|
|
|
struct commit *commit;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2015-09-24 21:08:03 +00:00
|
|
|
if (verbosity >= 0) {
|
2016-10-20 06:19:19 +00:00
|
|
|
printf(_("Updating %s..%s\n"),
|
|
|
|
find_unique_abbrev(head_commit->object.oid.hash,
|
|
|
|
DEFAULT_ABBREV),
|
|
|
|
find_unique_abbrev(remoteheads->item->object.oid.hash,
|
|
|
|
DEFAULT_ABBREV));
|
2015-09-24 21:08:03 +00:00
|
|
|
}
|
2009-10-24 08:31:32 +00:00
|
|
|
strbuf_addstr(&msg, "Fast-forward");
|
2008-07-07 17:24:20 +00:00
|
|
|
if (have_message)
|
|
|
|
strbuf_addstr(&msg,
|
|
|
|
" (no commit created; -m option ignored)");
|
2011-11-07 21:26:22 +00:00
|
|
|
commit = remoteheads->item;
|
2011-12-09 21:37:14 +00:00
|
|
|
if (!commit) {
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2017-05-06 22:10:33 +00:00
|
|
|
if (checkout_fast_forward(&head_commit->object.oid,
|
|
|
|
&commit->object.oid,
|
2012-10-26 15:53:49 +00:00
|
|
|
overwrite_ignore)) {
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2017-02-21 23:47:28 +00:00
|
|
|
finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
|
2008-07-07 17:24:20 +00:00
|
|
|
drop_save();
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
2008-07-07 17:24:20 +00:00
|
|
|
} else if (!remoteheads->next && common->next)
|
|
|
|
;
|
|
|
|
/*
|
2009-10-24 08:31:32 +00:00
|
|
|
* We are not doing octopus and not fast-forward. Need
|
2008-07-07 17:24:20 +00:00
|
|
|
* a real merge.
|
|
|
|
*/
|
|
|
|
else if (!remoteheads->next && !common->next && option_commit) {
|
|
|
|
/*
|
2009-10-24 08:31:32 +00:00
|
|
|
* We are not doing octopus, not fast-forward, and have
|
2008-07-07 17:24:20 +00:00
|
|
|
* only one common.
|
|
|
|
*/
|
|
|
|
refresh_cache(REFRESH_QUIET);
|
2013-07-02 14:47:57 +00:00
|
|
|
if (allow_trivial && fast_forward != FF_ONLY) {
|
2008-07-07 17:24:20 +00:00
|
|
|
/* See if it is really trivial. */
|
2012-05-24 23:28:40 +00:00
|
|
|
git_committer_info(IDENT_STRICT);
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Trying really trivial in-index merge...\n"));
|
2017-02-21 23:47:28 +00:00
|
|
|
if (!read_tree_trivial(&common->item->object.oid,
|
|
|
|
&head_commit->object.oid,
|
|
|
|
&remoteheads->item->object.oid)) {
|
2012-04-16 23:15:13 +00:00
|
|
|
ret = merge_trivial(head_commit, remoteheads);
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Nope.\n"));
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* An octopus. If we can reach all the remote we are up
|
|
|
|
* to date.
|
|
|
|
*/
|
|
|
|
int up_to_date = 1;
|
|
|
|
struct commit_list *j;
|
|
|
|
|
|
|
|
for (j = remoteheads; j; j = j->next) {
|
|
|
|
struct commit_list *common_one;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Here we *have* to calculate the individual
|
|
|
|
* merge_bases again, otherwise "git merge HEAD^
|
|
|
|
* HEAD^^" would be missed.
|
|
|
|
*/
|
2014-10-30 19:20:44 +00:00
|
|
|
common_one = get_merge_bases(head_commit, j->item);
|
2016-06-24 23:09:22 +00:00
|
|
|
if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
|
2008-07-07 17:24:20 +00:00
|
|
|
up_to_date = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (up_to_date) {
|
2016-06-17 20:21:17 +00:00
|
|
|
finish_up_to_date(_("Already up-to-date. Yeeah!"));
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward == FF_ONLY)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("Not possible to fast-forward, aborting."));
|
2009-10-29 22:08:31 +00:00
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
/* We are going to make a new commit. */
|
2012-05-24 23:28:40 +00:00
|
|
|
git_committer_info(IDENT_STRICT);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* At this point, we need a real merge. No matter what strategy
|
|
|
|
* we use, it would operate on the index, possibly affecting the
|
|
|
|
* working tree, and when resolved cleanly, have the desired
|
|
|
|
* tree in the index -- this means that the index must be in
|
|
|
|
* sync with the head commit. The strategies are responsible
|
|
|
|
* to ensure this.
|
|
|
|
*/
|
2011-08-19 14:50:05 +00:00
|
|
|
if (use_strategies_nr == 1 ||
|
|
|
|
/*
|
|
|
|
* Stash away the local changes so that we can try more than one.
|
|
|
|
*/
|
2017-02-21 23:47:28 +00:00
|
|
|
save_state(&stash))
|
|
|
|
oidclr(&stash);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
for (i = 0; i < use_strategies_nr; i++) {
|
|
|
|
int ret;
|
|
|
|
if (i) {
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Rewinding the tree to pristine...\n"));
|
2017-02-21 23:47:28 +00:00
|
|
|
restore_state(&head_commit->object.oid, &stash);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
if (use_strategies_nr != 1)
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Trying merge strategy %s...\n"),
|
2008-07-07 17:24:20 +00:00
|
|
|
use_strategies[i]->name);
|
|
|
|
/*
|
|
|
|
* Remember which strategy left the state in the working
|
|
|
|
* tree.
|
|
|
|
*/
|
|
|
|
wt_strategy = use_strategies[i]->name;
|
|
|
|
|
|
|
|
ret = try_merge_strategy(use_strategies[i]->name,
|
2012-04-16 23:15:13 +00:00
|
|
|
common, remoteheads,
|
2015-03-26 05:00:48 +00:00
|
|
|
head_commit);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!option_commit && !ret) {
|
|
|
|
merge_was_ok = 1;
|
|
|
|
/*
|
|
|
|
* This is necessary here just to avoid writing
|
|
|
|
* the tree, but later we will *not* exit with
|
|
|
|
* status code 1 because merge_was_ok is set.
|
|
|
|
*/
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
/*
|
|
|
|
* The backend exits with 1 when conflicts are
|
|
|
|
* left to be resolved, with 2 when it does not
|
|
|
|
* handle the given merge at all.
|
|
|
|
*/
|
|
|
|
if (ret == 1) {
|
|
|
|
int cnt = evaluate_result();
|
|
|
|
|
|
|
|
if (best_cnt <= 0 || cnt <= best_cnt) {
|
|
|
|
best_strategy = use_strategies[i]->name;
|
|
|
|
best_cnt = cnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (merge_was_ok)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Automerge succeeded. */
|
2017-02-21 23:47:28 +00:00
|
|
|
write_tree_trivial(&result_tree);
|
2008-07-07 17:24:20 +00:00
|
|
|
automerge_was_ok = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have a resulting tree, that means the strategy module
|
|
|
|
* auto resolved the merge cleanly.
|
|
|
|
*/
|
2011-11-13 10:22:15 +00:00
|
|
|
if (automerge_was_ok) {
|
2012-04-17 19:22:26 +00:00
|
|
|
ret = finish_automerge(head_commit, head_subsumed,
|
|
|
|
common, remoteheads,
|
2017-02-21 23:47:28 +00:00
|
|
|
&result_tree, wt_strategy);
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Pick the result from the best strategy and have the user fix
|
|
|
|
* it up.
|
|
|
|
*/
|
|
|
|
if (!best_strategy) {
|
2017-02-21 23:47:28 +00:00
|
|
|
restore_state(&head_commit->object.oid, &stash);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (use_strategies_nr > 1)
|
|
|
|
fprintf(stderr,
|
2011-02-22 23:41:59 +00:00
|
|
|
_("No merge strategy handled the merge.\n"));
|
2008-07-07 17:24:20 +00:00
|
|
|
else
|
2011-02-22 23:41:59 +00:00
|
|
|
fprintf(stderr, _("Merge with strategy %s failed.\n"),
|
2008-07-07 17:24:20 +00:00
|
|
|
use_strategies[0]->name);
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = 2;
|
|
|
|
goto done;
|
2008-07-07 17:24:20 +00:00
|
|
|
} else if (best_strategy == wt_strategy)
|
|
|
|
; /* We already have its result in the working tree. */
|
|
|
|
else {
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Rewinding the tree to pristine...\n"));
|
2017-02-21 23:47:28 +00:00
|
|
|
restore_state(&head_commit->object.oid, &stash);
|
2011-02-22 23:41:59 +00:00
|
|
|
printf(_("Using the %s to prepare resolving by hand.\n"),
|
2008-07-07 17:24:20 +00:00
|
|
|
best_strategy);
|
2012-04-16 23:15:13 +00:00
|
|
|
try_merge_strategy(best_strategy, common, remoteheads,
|
2015-03-26 05:00:48 +00:00
|
|
|
head_commit);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (squash)
|
2012-04-16 23:15:13 +00:00
|
|
|
finish(head_commit, remoteheads, NULL, NULL);
|
2011-10-08 18:39:52 +00:00
|
|
|
else
|
2012-04-16 23:15:13 +00:00
|
|
|
write_merge_state(remoteheads);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2011-11-13 10:22:15 +00:00
|
|
|
if (merge_was_ok)
|
2011-02-22 23:41:59 +00:00
|
|
|
fprintf(stderr, _("Automatic merge went well; "
|
|
|
|
"stopped before committing as requested\n"));
|
2011-11-13 10:22:15 +00:00
|
|
|
else
|
2014-10-24 18:27:22 +00:00
|
|
|
ret = suggest_conflicts();
|
2011-11-13 10:22:15 +00:00
|
|
|
|
|
|
|
done:
|
2011-12-13 14:17:48 +00:00
|
|
|
free(branch_to_free);
|
2011-11-13 10:22:15 +00:00
|
|
|
return ret;
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|