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"
|
|
|
|
#include "parse-options.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#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"
|
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[] = {
|
2012-08-20 12:32:24 +00:00
|
|
|
N_("git merge [options] [<commit>...]"),
|
|
|
|
N_("git merge [options] <msg> HEAD <commit>"),
|
|
|
|
N_("git merge --abort"),
|
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;
|
2011-02-20 09:53:21 +00:00
|
|
|
static int show_progress = -1;
|
2011-03-24 06:48:24 +00:00
|
|
|
static int default_to_upstream;
|
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,
|
|
|
|
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")),
|
|
|
|
OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
|
|
|
|
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
unlink(git_path("MERGE_HEAD"));
|
|
|
|
unlink(git_path("MERGE_MSG"));
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 12:04:47 +00:00
|
|
|
unlink(git_path("MERGE_MODE"));
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2011-08-19 14:50:05 +00:00
|
|
|
static int save_state(unsigned char *stash)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
|
|
|
int len;
|
|
|
|
struct child_process cp;
|
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
|
|
|
const char *argv[] = {"stash", "create", NULL};
|
|
|
|
|
|
|
|
memset(&cp, 0, sizeof(cp));
|
|
|
|
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);
|
|
|
|
if (get_sha1(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
|
|
|
}
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
static void restore_state(const unsigned char *head,
|
|
|
|
const unsigned char *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 };
|
|
|
|
|
|
|
|
if (is_null_sha1(stash))
|
|
|
|
return;
|
|
|
|
|
|
|
|
reset_hard(head, 1);
|
|
|
|
|
|
|
|
args[2] = sha1_to_hex(stash);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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;
|
2011-11-16 08:03:36 +00:00
|
|
|
const char *filename;
|
2008-07-07 17:24:20 +00:00
|
|
|
int fd;
|
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"));
|
2011-11-16 08:03:36 +00:00
|
|
|
filename = git_path("SQUASH_MSG");
|
|
|
|
fd = open(filename, O_WRONLY | O_CREAT, 0666);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (fd < 0)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not write to '%s'"), filename);
|
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",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
2011-05-26 22:27:49 +00:00
|
|
|
pretty_print_commit(&ctx, commit, &out);
|
2008-07-07 17:24:20 +00:00
|
|
|
}
|
2014-01-17 14:17:09 +00:00
|
|
|
if (write_in_full(fd, out.buf, out.len) != out.len)
|
2011-02-22 23:41:59 +00:00
|
|
|
die_errno(_("Writing SQUASH_MSG"));
|
2008-12-05 00:35:48 +00:00
|
|
|
if (close(fd))
|
2011-02-22 23:41:59 +00:00
|
|
|
die_errno(_("Finishing SQUASH_MSG"));
|
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,
|
2011-09-17 11:57:44 +00:00
|
|
|
const unsigned char *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;
|
2011-09-17 11:57:44 +00:00
|
|
|
const unsigned char *head = head_commit->object.sha1;
|
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",
|
|
|
|
new_head, head, 0,
|
|
|
|
DIE_ON_ERR);
|
|
|
|
/*
|
|
|
|
* We ignore errors in 'gc --auto', since the
|
|
|
|
* user should see them.
|
|
|
|
*/
|
|
|
|
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);
|
2008-07-07 17:24:20 +00:00
|
|
|
diff_tree_sha1(head, new_head, "", &opts);
|
|
|
|
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;
|
2011-11-13 10:22:14 +00:00
|
|
|
unsigned char branch_head[20];
|
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;
|
|
|
|
|
2009-03-21 20:17:30 +00:00
|
|
|
strbuf_branchname(&bname, remote);
|
|
|
|
remote = bname.buf;
|
2009-02-14 07:26:12 +00:00
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
memset(branch_head, 0, sizeof(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
|
|
|
|
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
|
|
|
if (dwim_ref(remote, strlen(remote), branch_head, &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",
|
|
|
|
sha1_to_hex(branch_head), remote);
|
|
|
|
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",
|
|
|
|
sha1_to_hex(branch_head), remote);
|
|
|
|
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",
|
2009-08-09 10:02:51 +00:00
|
|
|
sha1_to_hex(branch_head), remote);
|
|
|
|
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;
|
|
|
|
strbuf_addstr(&truname, "refs/heads/");
|
|
|
|
strbuf_addstr(&truname, 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",
|
2011-11-07 21:26:22 +00:00
|
|
|
sha1_to_hex(remote_head->object.sha1),
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(remote, "FETCH_HEAD") &&
|
|
|
|
!access(git_path("FETCH_HEAD"), R_OK)) {
|
2011-11-16 08:03:36 +00:00
|
|
|
const char *filename;
|
2008-07-07 17:24:20 +00:00
|
|
|
FILE *fp;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf line = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
char *ptr;
|
|
|
|
|
2011-11-16 08:03:36 +00:00
|
|
|
filename = git_path("FETCH_HEAD");
|
|
|
|
fp = fopen(filename, "r");
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!fp)
|
2011-02-22 23:41:59 +00:00
|
|
|
die_errno(_("could not open '%s' for reading"),
|
2011-11-16 08:03:36 +00:00
|
|
|
filename);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_getline(&line, fp, '\n');
|
|
|
|
fclose(fp);
|
|
|
|
ptr = strstr(line.buf, "\tnot-for-merge\t");
|
|
|
|
if (ptr)
|
|
|
|
strbuf_remove(&line, ptr-line.buf+1, 13);
|
|
|
|
strbuf_addbuf(msg, &line);
|
|
|
|
strbuf_release(&line);
|
2009-02-14 07:26:12 +00:00
|
|
|
goto cleanup;
|
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",
|
|
|
|
sha1_to_hex(desc->obj->sha1),
|
|
|
|
typename(desc->obj->type),
|
|
|
|
remote);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
|
2011-11-07 21:26:22 +00:00
|
|
|
sha1_to_hex(remote_head->object.sha1), 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));
|
2011-05-05 00:42:51 +00:00
|
|
|
argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
|
|
|
|
memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
|
|
|
|
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")) {
|
2011-05-06 19:27:05 +00:00
|
|
|
int boolval = git_config_maybe_bool(k, v);
|
|
|
|
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;
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int read_tree_trivial(unsigned char *common, unsigned char *head,
|
|
|
|
unsigned char *one)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
trees[nr_trees] = parse_tree_indirect(common);
|
|
|
|
if (!trees[nr_trees++])
|
|
|
|
return -1;
|
|
|
|
trees[nr_trees] = parse_tree_indirect(head);
|
|
|
|
if (!trees[nr_trees++])
|
|
|
|
return -1;
|
|
|
|
trees[nr_trees] = parse_tree_indirect(one);
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_tree_trivial(unsigned char *sha1)
|
|
|
|
{
|
|
|
|
if (write_cache_as_tree(sha1, 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,
|
2011-09-17 11:57:44 +00:00
|
|
|
struct commit *head, const char *head_arg)
|
2010-03-31 19:22:06 +00:00
|
|
|
{
|
2008-10-03 13:02:31 +00:00
|
|
|
int index_fd;
|
|
|
|
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
|
|
|
|
|
|
|
|
index_fd = hold_locked_index(lock, 1);
|
|
|
|
refresh_cache(REFRESH_QUIET);
|
|
|
|
if (active_cache_changed &&
|
|
|
|
(write_cache(index_fd, active_cache, active_nr) ||
|
|
|
|
commit_locked_index(lock)))
|
2011-02-22 23:41:59 +00:00
|
|
|
return error(_("Unable to write index."));
|
2008-10-03 13:02:31 +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 lock_file *lock = xcalloc(1, sizeof(struct lock_file));
|
|
|
|
int index_fd;
|
|
|
|
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);
|
|
|
|
|
|
|
|
index_fd = hold_locked_index(lock, 1);
|
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);
|
|
|
|
if (active_cache_changed &&
|
|
|
|
(write_cache(index_fd, active_cache, active_nr) ||
|
|
|
|
commit_locked_index(lock)))
|
2011-02-22 23:41:59 +00:00
|
|
|
die (_("unable to write %s"), get_index_file());
|
2008-09-06 16:29:49 +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 split_merge_strategies(const char *string, struct strategy **list,
|
|
|
|
int *nr, int *alloc)
|
|
|
|
{
|
|
|
|
char *p, *q, *buf;
|
|
|
|
|
|
|
|
if (!string)
|
|
|
|
return;
|
|
|
|
|
|
|
|
buf = xstrdup(string);
|
|
|
|
q = buf;
|
|
|
|
for (;;) {
|
|
|
|
p = strchr(q, ' ');
|
|
|
|
if (!p) {
|
|
|
|
ALLOC_GROW(*list, *nr + 1, *alloc);
|
|
|
|
(*list)[(*nr)++].name = xstrdup(q);
|
|
|
|
free(buf);
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
*p = '\0';
|
|
|
|
ALLOC_GROW(*list, *nr + 1, *alloc);
|
|
|
|
(*list)[(*nr)++].name = xstrdup(q);
|
|
|
|
q = ++p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_strategies(const char *string, unsigned attr)
|
|
|
|
{
|
|
|
|
struct strategy *list = NULL;
|
|
|
|
int list_alloc = 0, list_nr = 0, i;
|
|
|
|
|
|
|
|
memset(&list, 0, sizeof(list));
|
|
|
|
split_merge_strategies(string, &list, &list_nr, &list_alloc);
|
2008-07-21 16:10:47 +00:00
|
|
|
if (list) {
|
|
|
|
for (i = 0; i < list_nr; i++)
|
|
|
|
append_strategy(get_strategy(list[i].name));
|
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 write_merge_msg(struct strbuf *msg)
|
2011-02-15 01:07:50 +00:00
|
|
|
{
|
2011-11-16 08:03:36 +00:00
|
|
|
const char *filename = git_path("MERGE_MSG");
|
|
|
|
int fd = open(filename, O_WRONLY | O_CREAT, 0666);
|
2011-02-15 01:07:50 +00:00
|
|
|
if (fd < 0)
|
2011-04-02 00:55:55 +00:00
|
|
|
die_errno(_("Could not open '%s' for writing"),
|
2011-11-16 08:03:36 +00:00
|
|
|
filename);
|
2011-10-08 18:39:52 +00:00
|
|
|
if (write_in_full(fd, msg->buf, msg->len) != msg->len)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not write to '%s'"), filename);
|
2011-02-15 01:07:50 +00:00
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
|
2011-10-08 18:39:52 +00:00
|
|
|
static void read_merge_msg(struct strbuf *msg)
|
2011-02-15 01:07:50 +00:00
|
|
|
{
|
2011-11-16 08:03:36 +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);
|
2011-10-08 18:39:52 +00:00
|
|
|
write_merge_msg(&msg);
|
2014-03-18 10:00:54 +00:00
|
|
|
if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
|
2014-03-18 10:00:53 +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) {
|
2011-10-08 18:39:52 +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);
|
2012-01-11 06:44:45 +00:00
|
|
|
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
|
|
|
{
|
|
|
|
unsigned char result_tree[20], result_commit[20];
|
2008-10-09 00:07:54 +00:00
|
|
|
struct commit_list *parent = xmalloc(sizeof(*parent));
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
write_tree_trivial(result_tree);
|
2011-02-22 23:42:02 +00:00
|
|
|
printf(_("Wonderful.\n"));
|
2011-09-17 11:57:44 +00:00
|
|
|
parent->item = head;
|
2008-10-09 00:07:54 +00:00
|
|
|
parent->next = xmalloc(sizeof(*parent->next));
|
merge: fix numerus bugs around "trivial merge" area
The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised. Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends. This assumption is now broken by the
above fix. To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-23 19:56:57 +00:00
|
|
|
parent->next->item = remoteheads->item;
|
|
|
|
parent->next->next = NULL;
|
2012-04-16 23:15:13 +00:00
|
|
|
prepare_to_commit(remoteheads);
|
2012-01-06 20:44:07 +00:00
|
|
|
if (commit_tree(&merge_msg, result_tree, parent, result_commit, NULL,
|
|
|
|
sign_commit))
|
2011-12-15 13:47:21 +00:00
|
|
|
die(_("failed to write commit object"));
|
2012-04-16 23:15:13 +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,
|
2008-07-07 17:24:20 +00:00
|
|
|
unsigned char *result_tree,
|
|
|
|
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;
|
|
|
|
unsigned char result_commit[20];
|
|
|
|
|
|
|
|
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);
|
2012-01-06 20:44:07 +00:00
|
|
|
if (commit_tree(&merge_msg, result_tree, parents, result_commit,
|
|
|
|
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);
|
2012-04-16 23:15:13 +00:00
|
|
|
finish(head, remoteheads, result_commit, buf.buf);
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_release(&buf);
|
|
|
|
drop_save();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-08-05 11:32:41 +00:00
|
|
|
static int suggest_conflicts(int renormalizing)
|
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;
|
|
|
|
int pos;
|
|
|
|
|
2011-11-16 08:03:36 +00:00
|
|
|
filename = git_path("MERGE_MSG");
|
|
|
|
fp = fopen(filename, "a");
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!fp)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not open '%s' for writing"), filename);
|
2008-07-07 17:24:20 +00:00
|
|
|
fprintf(fp, "\nConflicts:\n");
|
|
|
|
for (pos = 0; pos < active_nr; pos++) {
|
Convert "struct cache_entry *" to "const ..." wherever possible
I attempted to make index_state->cache[] a "const struct cache_entry **"
to find out how existing entries in index are modified and where. The
question I have is what do we do if we really need to keep track of on-disk
changes in the index. The result is
- diff-lib.c: setting CE_UPTODATE
- name-hash.c: setting CE_HASHED
- preload-index.c, read-cache.c, unpack-trees.c and
builtin/update-index: obvious
- entry.c: write_entry() may refresh the checked out entry via
fill_stat_cache_info(). This causes "non-const struct cache_entry
*" in builtin/apply.c, builtin/checkout-index.c and
builtin/checkout.c
- builtin/ls-files.c: --with-tree changes stagemask and may set
CE_UPDATE
Of these, write_entry() and its call sites are probably most
interesting because it modifies on-disk info. But this is stat info
and can be retrieved via refresh, at least for porcelain
commands. Other just uses ce_flags for local purposes.
So, keeping track of "dirty" entries is just a matter of setting a
flag in index modification functions exposed by read-cache.c. Except
unpack-trees, the rest of the code base does not do anything funny
behind read-cache's back.
The actual patch is less valueable than the summary above. But if
anyone wants to re-identify the above sites. Applying this patch, then
this:
diff --git a/cache.h b/cache.h
index 430d021..1692891 100644
--- a/cache.h
+++ b/cache.h
@@ -267,7 +267,7 @@ static inline unsigned int canon_mode(unsigned int mode)
#define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1)
struct index_state {
- struct cache_entry **cache;
+ const struct cache_entry **cache;
unsigned int version;
unsigned int cache_nr, cache_alloc, cache_changed;
struct string_list *resolve_undo;
will help quickly identify them without bogus warnings.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-09 15:29:00 +00:00
|
|
|
const struct cache_entry *ce = active_cache[pos];
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
if (ce_stage(ce)) {
|
|
|
|
fprintf(fp, "\t%s\n", ce->name);
|
|
|
|
while (pos + 1 < active_nr &&
|
|
|
|
!strcmp(ce->name,
|
|
|
|
active_cache[pos + 1]->name))
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
static struct commit *is_old_style_invocation(int argc, const char **argv,
|
|
|
|
const unsigned char *head)
|
2008-07-07 17:24:20 +00:00
|
|
|
{
|
|
|
|
struct commit *second_token = NULL;
|
2009-12-02 17:59:35 +00:00
|
|
|
if (argc > 2) {
|
2008-07-07 17:24:20 +00:00
|
|
|
unsigned char second_sha1[20];
|
|
|
|
|
|
|
|
if (get_sha1(argv[1], second_sha1))
|
|
|
|
return NULL;
|
|
|
|
second_token = lookup_commit_reference_gently(second_sha1, 0);
|
|
|
|
if (!second_token)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("'%s' is not a commit"), argv[1]);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (hashcmp(second_token->object.sha1, head))
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return second_token;
|
|
|
|
}
|
|
|
|
|
|
|
|
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."));
|
2011-03-24 06:48:24 +00:00
|
|
|
if (!branch->remote)
|
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
|
|
|
|
|
|
|
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
|
|
|
|
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
|
|
|
{
|
2011-11-16 08:03:36 +00:00
|
|
|
const char *filename;
|
2011-10-08 18:39:52 +00:00
|
|
|
int fd;
|
|
|
|
struct commit_list *j;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
2011-11-07 22:45:10 +00:00
|
|
|
for (j = remoteheads; j; j = j->next) {
|
|
|
|
unsigned const char *sha1;
|
|
|
|
struct commit *c = j->item;
|
|
|
|
if (c->util && merge_remote_util(c)->obj) {
|
|
|
|
sha1 = merge_remote_util(c)->obj->sha1;
|
|
|
|
} else {
|
|
|
|
sha1 = c->object.sha1;
|
|
|
|
}
|
|
|
|
strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1));
|
|
|
|
}
|
2011-11-16 08:03:36 +00:00
|
|
|
filename = git_path("MERGE_HEAD");
|
|
|
|
fd = open(filename, O_WRONLY | O_CREAT, 0666);
|
2011-10-08 18:39:52 +00:00
|
|
|
if (fd < 0)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not open '%s' for writing"), filename);
|
2011-10-08 18:39:52 +00:00
|
|
|
if (write_in_full(fd, buf.buf, buf.len) != buf.len)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not write to '%s'"), filename);
|
2011-10-08 18:39:52 +00:00
|
|
|
close(fd);
|
|
|
|
strbuf_addch(&merge_msg, '\n');
|
|
|
|
write_merge_msg(&merge_msg);
|
2011-11-16 08:03:36 +00:00
|
|
|
|
|
|
|
filename = git_path("MERGE_MODE");
|
|
|
|
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
2011-10-08 18:39:52 +00:00
|
|
|
if (fd < 0)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not open '%s' for writing"), filename);
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_reset(&buf);
|
2013-07-02 14:47:57 +00:00
|
|
|
if (fast_forward == FF_NO)
|
2011-10-08 18:39:52 +00:00
|
|
|
strbuf_addf(&buf, "no-ff");
|
|
|
|
if (write_in_full(fd, buf.buf, buf.len) != buf.len)
|
2011-11-16 08:03:36 +00:00
|
|
|
die_errno(_("Could not write to '%s'"), filename);
|
2011-10-08 18:39:52 +00:00
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
|
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) {
|
|
|
|
int v = git_config_maybe_bool(name, e);
|
|
|
|
if (v < 0)
|
|
|
|
die("Bad value '%s' in environment '%s'", e, name);
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2012-04-17 19:22:26 +00:00
|
|
|
static struct commit_list *collect_parents(struct commit *head_commit,
|
|
|
|
int *head_subsumed,
|
|
|
|
int argc, const char **argv)
|
2012-04-17 18:31:10 +00:00
|
|
|
{
|
|
|
|
int i;
|
2012-04-17 19:22:26 +00:00
|
|
|
struct commit_list *remoteheads = NULL, *parents, *next;
|
2012-04-17 18:31:10 +00:00
|
|
|
struct commit_list **remotes = &remoteheads;
|
|
|
|
|
2012-04-17 19:22:26 +00:00
|
|
|
if (head_commit)
|
|
|
|
remotes = &commit_list_insert(head_commit, remotes)->next;
|
2012-04-17 18:31:10 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
struct commit *commit = get_merge_parent(argv[i]);
|
|
|
|
if (!commit)
|
2013-05-04 00:04:20 +00:00
|
|
|
help_unknown_ref(argv[i], "merge",
|
|
|
|
"not something we can merge");
|
2012-04-17 18:31:10 +00:00
|
|
|
remotes = &commit_list_insert(commit, remotes)->next;
|
|
|
|
}
|
|
|
|
*remotes = NULL;
|
2012-04-17 19:22:26 +00:00
|
|
|
|
|
|
|
parents = reduce_heads(remoteheads);
|
|
|
|
|
|
|
|
*head_subsumed = 1; /* we will flip this to 0 when we find it */
|
|
|
|
for (remoteheads = NULL, remotes = &remoteheads;
|
|
|
|
parents;
|
|
|
|
parents = next) {
|
|
|
|
struct commit *commit = parents->item;
|
|
|
|
next = parents->next;
|
|
|
|
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
|
|
|
|
2008-07-07 17:24:20 +00:00
|
|
|
int cmd_merge(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
unsigned char result_tree[20];
|
2011-08-19 14:50:05 +00:00
|
|
|
unsigned char stash[20];
|
2011-09-17 11:57:44 +00:00
|
|
|
unsigned char head_sha1[20];
|
|
|
|
struct commit *head_commit;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
const char *head_arg;
|
2012-04-17 19:22:26 +00:00
|
|
|
int flag, 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;
|
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.
|
|
|
|
*/
|
2011-12-13 14:17:48 +00:00
|
|
|
branch = branch_to_free = resolve_refdup("HEAD", head_sha1, 0, &flag);
|
2013-11-30 20:55:40 +00:00
|
|
|
if (branch && starts_with(branch, "refs/heads/"))
|
2011-12-13 14:17:48 +00:00
|
|
|
branch += 11;
|
2011-09-17 11:57:44 +00:00
|
|
|
if (!branch || is_null_sha1(head_sha1))
|
|
|
|
head_commit = NULL;
|
2011-09-17 11:57:45 +00:00
|
|
|
else
|
|
|
|
head_commit = lookup_commit_or_die(head_sha1, "HEAD");
|
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};
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2010-11-09 21:49:58 +00:00
|
|
|
if (read_cache_unmerged())
|
|
|
|
die_resolve_conflict("merge");
|
|
|
|
|
|
|
|
if (file_exists(git_path("MERGE_HEAD"))) {
|
|
|
|
/*
|
|
|
|
* 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"
|
|
|
|
"Please, commit your changes before you can 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
|
|
|
}
|
2011-02-20 04:12:27 +00:00
|
|
|
if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
|
|
|
|
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"
|
|
|
|
"Please, commit your changes before you can 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;
|
|
|
|
}
|
|
|
|
|
2011-04-07 22:57:57 +00:00
|
|
|
if (!abort_current_merge) {
|
2011-11-21 13:30:40 +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], "-"))
|
2011-04-07 22:57:57 +00:00
|
|
|
argv[0] = "@{-1}";
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!argc)
|
|
|
|
usage_with_options(builtin_merge_usage,
|
|
|
|
builtin_merge_options);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This could be traditional "merge <msg> HEAD <commit>..." and
|
|
|
|
* the way we can tell it is to see if the second token is HEAD,
|
|
|
|
* but some people might have misused the interface and used a
|
2013-09-04 19:04:31 +00:00
|
|
|
* commit-ish that is the same as HEAD there instead.
|
2008-07-07 17:24:20 +00:00
|
|
|
* Traditional format never would have "-m" so it is an
|
|
|
|
* additional safety measure to check for it.
|
|
|
|
*/
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
if (!have_message && head_commit &&
|
|
|
|
is_old_style_invocation(argc, argv, head_commit->object.sha1)) {
|
2008-07-07 17:24:20 +00:00
|
|
|
strbuf_addstr(&merge_msg, argv[0]);
|
|
|
|
head_arg = argv[1];
|
|
|
|
argv += 2;
|
|
|
|
argc -= 2;
|
2012-04-17 19:22:26 +00:00
|
|
|
remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv);
|
2011-09-17 11:57:44 +00:00
|
|
|
} else if (!head_commit) {
|
2011-11-07 21:26:22 +00:00
|
|
|
struct commit *remote_head;
|
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".
|
|
|
|
*/
|
|
|
|
if (argc != 1)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("Can merge only exactly one commit into "
|
|
|
|
"empty head"));
|
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"));
|
2012-04-17 19:22:26 +00:00
|
|
|
remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv);
|
2012-04-17 18:31:10 +00:00
|
|
|
remote_head = remoteheads->item;
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!remote_head)
|
2011-02-22 23:41:59 +00:00
|
|
|
die(_("%s - not something we can merge"), argv[0]);
|
2011-11-07 21:26:22 +00:00
|
|
|
read_empty(remote_head->object.sha1, 0);
|
|
|
|
update_ref("initial pull", "HEAD", remote_head->object.sha1,
|
|
|
|
NULL, 0, DIE_ON_ERR);
|
2011-11-13 10:22:15 +00:00
|
|
|
goto done;
|
2008-07-07 17:24:20 +00:00
|
|
|
} else {
|
2010-05-10 17:17:48 +00:00
|
|
|
struct strbuf merge_names = STRBUF_INIT;
|
2008-07-07 17:24:20 +00:00
|
|
|
|
|
|
|
/* We are invoked directly as the first-class UI. */
|
|
|
|
head_arg = "HEAD";
|
|
|
|
|
|
|
|
/*
|
2011-11-07 21:26:22 +00:00
|
|
|
* All the rest are the commits being merged; prepare
|
|
|
|
* the standard merge summary message to be appended
|
|
|
|
* to the given message.
|
2008-07-07 17:24:20 +00:00
|
|
|
*/
|
2012-04-17 19:22:26 +00:00
|
|
|
remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv);
|
2012-04-17 18:31:10 +00:00
|
|
|
for (p = remoteheads; p; p = p->next)
|
|
|
|
merge_name(merge_remote_util(p->item)->name, &merge_names);
|
2010-05-10 17:17:52 +00:00
|
|
|
|
2010-09-08 17:59:54 +00:00
|
|
|
if (!have_message || shortlog_len) {
|
2011-11-05 00:35:42 +00:00
|
|
|
struct fmt_merge_msg_opts opts;
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
opts.add_title = !have_message;
|
|
|
|
opts.shortlog_len = shortlog_len;
|
2012-12-28 23:29:31 +00:00
|
|
|
opts.credit_people = (0 < option_edit);
|
2011-11-05 00:35:42 +00:00
|
|
|
|
|
|
|
fmt_merge_msg(&merge_names, &merge_msg, &opts);
|
2010-09-08 17:59:53 +00:00
|
|
|
if (merge_msg.len)
|
|
|
|
strbuf_setlen(&merge_msg, merge_msg.len - 1);
|
|
|
|
}
|
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;
|
|
|
|
char hex[41];
|
|
|
|
struct signature_check signature_check;
|
|
|
|
memset(&signature_check, 0, sizeof(signature_check));
|
|
|
|
|
|
|
|
check_commit_signature(commit, &signature_check);
|
|
|
|
|
|
|
|
strcpy(hex, find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
|
|
|
|
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);
|
|
|
|
|
|
|
|
free(signature_check.gpg_output);
|
|
|
|
free(signature_check.gpg_status);
|
|
|
|
free(signature_check.signer);
|
|
|
|
free(signature_check.key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
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)
|
2011-09-17 11:57:44 +00:00
|
|
|
common = get_merge_bases(head_commit, remoteheads->item, 1);
|
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);
|
|
|
|
}
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.sha1,
|
|
|
|
NULL, 0, DIE_ON_ERR);
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2012-04-17 19:22:26 +00:00
|
|
|
if (remoteheads && !common)
|
2008-07-07 17:24:20 +00:00
|
|
|
; /* No common ancestors found. We need a real merge. */
|
2012-04-17 19:22:26 +00:00
|
|
|
else if (!remoteheads ||
|
|
|
|
(!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.
|
|
|
|
*/
|
|
|
|
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 &&
|
2011-09-17 11:57:44 +00:00
|
|
|
!hashcmp(common->item->object.sha1, head_commit->object.sha1)) {
|
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
|
|
|
char hex[41];
|
|
|
|
|
2011-09-17 11:57:44 +00:00
|
|
|
strcpy(hex, find_unique_abbrev(head_commit->object.sha1, DEFAULT_ABBREV));
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0)
|
2011-02-22 23:42:00 +00:00
|
|
|
printf(_("Updating %s..%s\n"),
|
2008-11-15 00:14:24 +00:00
|
|
|
hex,
|
|
|
|
find_unique_abbrev(remoteheads->item->object.sha1,
|
|
|
|
DEFAULT_ABBREV));
|
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
|
|
|
|
2011-11-07 21:26:22 +00:00
|
|
|
if (checkout_fast_forward(head_commit->object.sha1,
|
2012-10-26 15:53:49 +00:00
|
|
|
commit->object.sha1,
|
|
|
|
overwrite_ignore)) {
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
2008-07-07 17:24:20 +00:00
|
|
|
|
2012-04-16 23:15:13 +00:00
|
|
|
finish(head_commit, remoteheads, commit->object.sha1, 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"));
|
2008-07-07 17:24:20 +00:00
|
|
|
if (!read_tree_trivial(common->item->object.sha1,
|
2011-11-13 10:22:15 +00:00
|
|
|
head_commit->object.sha1,
|
|
|
|
remoteheads->item->object.sha1)) {
|
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.
|
|
|
|
*/
|
2011-09-17 11:57:44 +00:00
|
|
|
common_one = get_merge_bases(head_commit, j->item, 1);
|
2008-07-07 17:24:20 +00:00
|
|
|
if (hashcmp(common_one->item->object.sha1,
|
|
|
|
j->item->object.sha1)) {
|
|
|
|
up_to_date = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (up_to_date) {
|
|
|
|
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.
|
|
|
|
*/
|
|
|
|
save_state(stash))
|
|
|
|
hashcpy(stash, null_sha1);
|
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"));
|
2011-09-17 11:57:44 +00:00
|
|
|
restore_state(head_commit->object.sha1, 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,
|
|
|
|
head_commit, head_arg);
|
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. */
|
|
|
|
write_tree_trivial(result_tree);
|
|
|
|
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,
|
2012-04-16 23:15:13 +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) {
|
2011-09-17 11:57:44 +00:00
|
|
|
restore_state(head_commit->object.sha1, 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"));
|
2011-09-17 11:57:44 +00:00
|
|
|
restore_state(head_commit->object.sha1, 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,
|
|
|
|
head_commit, head_arg);
|
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
|
|
|
|
ret = suggest_conflicts(option_renormalize);
|
|
|
|
|
|
|
|
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
|
|
|
}
|