2007-03-01 04:26:30 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "wt-status.h"
|
|
|
|
#include "run-command.h"
|
|
|
|
#include "exec_cmd.h"
|
|
|
|
#include "utf8.h"
|
2007-10-07 21:02:29 +00:00
|
|
|
#include "parse-options.h"
|
2008-01-11 06:49:35 +00:00
|
|
|
#include "cache-tree.h"
|
2008-03-03 06:30:56 +00:00
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2008-08-10 11:48:55 +00:00
|
|
|
#include "rerere.h"
|
2008-09-02 21:11:15 +00:00
|
|
|
#include "merge-recursive.h"
|
2010-03-06 20:34:42 +00:00
|
|
|
#include "refs.h"
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This implements the builtins revert and cherry-pick.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2007 Johannes E. Schindelin
|
|
|
|
*
|
|
|
|
* Based on git-revert.sh, which is
|
|
|
|
*
|
|
|
|
* Copyright (c) 2005 Linus Torvalds
|
|
|
|
* Copyright (c) 2005 Junio C Hamano
|
|
|
|
*/
|
|
|
|
|
2007-10-07 21:02:29 +00:00
|
|
|
static const char * const revert_usage[] = {
|
2008-07-13 13:36:15 +00:00
|
|
|
"git revert [options] <commit-ish>",
|
2007-10-07 21:02:29 +00:00
|
|
|
NULL
|
|
|
|
};
|
2007-03-01 04:26:30 +00:00
|
|
|
|
2007-10-07 21:02:29 +00:00
|
|
|
static const char * const cherry_pick_usage[] = {
|
2008-07-13 13:36:15 +00:00
|
|
|
"git cherry-pick [options] <commit-ish>",
|
2007-10-07 21:02:29 +00:00
|
|
|
NULL
|
|
|
|
};
|
2007-03-01 04:26:30 +00:00
|
|
|
|
2010-03-06 20:34:42 +00:00
|
|
|
static int edit, no_replay, no_commit, mainline, signoff, allow_ff;
|
2007-06-13 08:42:05 +00:00
|
|
|
static enum { REVERT, CHERRY_PICK } action;
|
2007-03-01 04:26:30 +00:00
|
|
|
static struct commit *commit;
|
2010-06-02 05:58:38 +00:00
|
|
|
static int commit_argc;
|
|
|
|
static const char **commit_argv;
|
2009-12-04 08:20:48 +00:00
|
|
|
static int allow_rerere_auto;
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
static const char *me;
|
2010-03-31 19:22:08 +00:00
|
|
|
static const char *strategy;
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
|
|
|
|
|
2010-03-21 00:45:21 +00:00
|
|
|
static char *get_encoding(const char *message);
|
|
|
|
|
2007-10-07 21:02:29 +00:00
|
|
|
static void parse_args(int argc, const char **argv)
|
2007-03-01 04:26:30 +00:00
|
|
|
{
|
2007-10-07 21:02:29 +00:00
|
|
|
const char * const * usage_str =
|
|
|
|
action == REVERT ? revert_usage : cherry_pick_usage;
|
|
|
|
int noop;
|
|
|
|
struct option options[] = {
|
|
|
|
OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
|
|
|
|
OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
|
|
|
|
OPT_BOOLEAN('r', NULL, &noop, "no-op (backward compatibility)"),
|
2008-04-26 20:14:28 +00:00
|
|
|
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
|
2007-11-04 08:26:02 +00:00
|
|
|
OPT_INTEGER('m', "mainline", &mainline, "parent number"),
|
2009-12-04 08:20:48 +00:00
|
|
|
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
|
2010-03-31 19:22:08 +00:00
|
|
|
OPT_STRING(0, "strategy", &strategy, "strategy", "merge strategy"),
|
2007-10-07 21:02:29 +00:00
|
|
|
OPT_END(),
|
2010-03-06 20:34:42 +00:00
|
|
|
OPT_END(),
|
|
|
|
OPT_END(),
|
2007-10-07 21:02:29 +00:00
|
|
|
};
|
|
|
|
|
2010-03-06 20:34:42 +00:00
|
|
|
if (action == CHERRY_PICK) {
|
|
|
|
struct option cp_extra[] = {
|
2010-06-02 05:58:34 +00:00
|
|
|
OPT_BOOLEAN('x', NULL, &no_replay, "append commit name"),
|
2010-03-06 20:34:42 +00:00
|
|
|
OPT_BOOLEAN(0, "ff", &allow_ff, "allow fast-forward"),
|
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
|
|
|
|
die("program error");
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:38 +00:00
|
|
|
commit_argc = parse_options(argc, argv, NULL, options, usage_str, 0);
|
|
|
|
if (commit_argc < 1)
|
2007-10-07 21:02:29 +00:00
|
|
|
usage_with_options(usage_str, options);
|
2007-03-01 04:26:30 +00:00
|
|
|
|
2010-06-02 05:58:38 +00:00
|
|
|
commit_argv = argv;
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
|
|
|
|
2010-03-21 00:45:21 +00:00
|
|
|
struct commit_message {
|
|
|
|
char *parent_label;
|
|
|
|
const char *label;
|
|
|
|
const char *subject;
|
|
|
|
char *reencoded_message;
|
|
|
|
const char *message;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int get_message(const char *raw_message, struct commit_message *out)
|
2007-03-01 04:26:30 +00:00
|
|
|
{
|
2010-03-21 00:45:21 +00:00
|
|
|
const char *encoding;
|
|
|
|
const char *p, *abbrev, *eol;
|
|
|
|
char *q;
|
2007-03-01 04:26:30 +00:00
|
|
|
int abbrev_len, oneline_len;
|
|
|
|
|
2010-03-21 00:45:21 +00:00
|
|
|
if (!raw_message)
|
|
|
|
return -1;
|
|
|
|
encoding = get_encoding(raw_message);
|
|
|
|
if (!encoding)
|
|
|
|
encoding = "UTF-8";
|
|
|
|
if (!git_commit_encoding)
|
|
|
|
git_commit_encoding = "UTF-8";
|
2010-05-08 23:17:29 +00:00
|
|
|
|
|
|
|
out->reencoded_message = NULL;
|
|
|
|
out->message = raw_message;
|
|
|
|
if (strcmp(encoding, git_commit_encoding))
|
|
|
|
out->reencoded_message = reencode_string(raw_message,
|
|
|
|
git_commit_encoding, encoding);
|
|
|
|
if (out->reencoded_message)
|
2010-03-21 00:45:21 +00:00
|
|
|
out->message = out->reencoded_message;
|
|
|
|
|
|
|
|
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
|
|
|
|
abbrev_len = strlen(abbrev);
|
|
|
|
|
|
|
|
/* Find beginning and end of commit subject. */
|
|
|
|
p = out->message;
|
2007-03-01 04:26:30 +00:00
|
|
|
while (*p && (*p != '\n' || p[1] != '\n'))
|
|
|
|
p++;
|
|
|
|
if (*p) {
|
|
|
|
p += 2;
|
|
|
|
for (eol = p + 1; *eol && *eol != '\n'; eol++)
|
|
|
|
; /* do nothing */
|
|
|
|
} else
|
|
|
|
eol = p;
|
|
|
|
oneline_len = eol - p;
|
2010-03-21 00:45:21 +00:00
|
|
|
|
|
|
|
out->parent_label = xmalloc(strlen("parent of ") + abbrev_len +
|
|
|
|
strlen("... ") + oneline_len + 1);
|
|
|
|
q = out->parent_label;
|
|
|
|
q = mempcpy(q, "parent of ", strlen("parent of "));
|
|
|
|
out->label = q;
|
|
|
|
q = mempcpy(q, abbrev, abbrev_len);
|
|
|
|
q = mempcpy(q, "... ", strlen("... "));
|
|
|
|
out->subject = q;
|
|
|
|
q = mempcpy(q, p, oneline_len);
|
|
|
|
*q = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_message(struct commit_message *msg)
|
|
|
|
{
|
|
|
|
free(msg->parent_label);
|
|
|
|
free(msg->reencoded_message);
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
|
|
|
|
2007-06-07 20:45:00 +00:00
|
|
|
static char *get_encoding(const char *message)
|
2007-03-01 04:26:30 +00:00
|
|
|
{
|
|
|
|
const char *p = message, *eol;
|
|
|
|
|
|
|
|
if (!p)
|
|
|
|
die ("Could not read commit message of %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
while (*p && *p != '\n') {
|
|
|
|
for (eol = p + 1; *eol && *eol != '\n'; eol++)
|
|
|
|
; /* do nothing */
|
|
|
|
if (!prefixcmp(p, "encoding ")) {
|
|
|
|
char *result = xmalloc(eol - 8 - p);
|
|
|
|
strlcpy(result, p + 9, eol - 8 - p);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
p = eol;
|
|
|
|
if (*p == '\n')
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-03-31 19:22:04 +00:00
|
|
|
static void add_message_to_msg(struct strbuf *msgbuf, const char *message)
|
2007-03-01 04:26:30 +00:00
|
|
|
{
|
|
|
|
const char *p = message;
|
|
|
|
while (*p && (*p != '\n' || p[1] != '\n'))
|
|
|
|
p++;
|
|
|
|
|
|
|
|
if (!*p)
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(msgbuf, sha1_to_hex(commit->object.sha1));
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
p += 2;
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(msgbuf, p);
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void set_author_ident_env(const char *message)
|
|
|
|
{
|
|
|
|
const char *p = message;
|
|
|
|
if (!p)
|
|
|
|
die ("Could not read commit message of %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
while (*p && *p != '\n') {
|
|
|
|
const char *eol;
|
|
|
|
|
|
|
|
for (eol = p; *eol && *eol != '\n'; eol++)
|
|
|
|
; /* do nothing */
|
|
|
|
if (!prefixcmp(p, "author ")) {
|
|
|
|
char *line, *pend, *email, *timestamp;
|
|
|
|
|
|
|
|
p += 7;
|
2007-09-15 22:32:36 +00:00
|
|
|
line = xmemdupz(p, eol - p);
|
2007-03-01 04:26:30 +00:00
|
|
|
email = strchr(line, '<');
|
|
|
|
if (!email)
|
|
|
|
die ("Could not extract author email from %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
if (email == line)
|
|
|
|
pend = line;
|
|
|
|
else
|
|
|
|
for (pend = email; pend != line + 1 &&
|
|
|
|
isspace(pend[-1]); pend--);
|
|
|
|
; /* do nothing */
|
|
|
|
*pend = '\0';
|
|
|
|
email++;
|
|
|
|
timestamp = strchr(email, '>');
|
|
|
|
if (!timestamp)
|
2008-08-02 01:51:21 +00:00
|
|
|
die ("Could not extract author time from %s",
|
2007-03-01 04:26:30 +00:00
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
*timestamp = '\0';
|
|
|
|
for (timestamp++; *timestamp && isspace(*timestamp);
|
|
|
|
timestamp++)
|
|
|
|
; /* do nothing */
|
|
|
|
setenv("GIT_AUTHOR_NAME", line, 1);
|
|
|
|
setenv("GIT_AUTHOR_EMAIL", email, 1);
|
|
|
|
setenv("GIT_AUTHOR_DATE", timestamp, 1);
|
|
|
|
free(line);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
p = eol;
|
|
|
|
if (*p == '\n')
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
die ("No author information found in %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:37 +00:00
|
|
|
static char *help_msg(void)
|
2007-11-28 08:06:36 +00:00
|
|
|
{
|
2010-02-11 21:07:06 +00:00
|
|
|
struct strbuf helpbuf = STRBUF_INIT;
|
2007-11-28 08:06:36 +00:00
|
|
|
char *msg = getenv("GIT_CHERRY_PICK_HELP");
|
|
|
|
|
|
|
|
if (msg)
|
|
|
|
return msg;
|
|
|
|
|
2010-02-11 21:07:06 +00:00
|
|
|
strbuf_addstr(&helpbuf, " After resolving the conflicts,\n"
|
2010-02-11 21:06:01 +00:00
|
|
|
"mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
|
2010-02-11 21:19:37 +00:00
|
|
|
"and commit the result");
|
2007-11-28 08:06:36 +00:00
|
|
|
|
|
|
|
if (action == CHERRY_PICK) {
|
2010-02-11 21:19:37 +00:00
|
|
|
strbuf_addf(&helpbuf, " with: \n"
|
|
|
|
"\n"
|
|
|
|
" git commit -c %s\n",
|
2010-06-02 05:58:37 +00:00
|
|
|
sha1_to_hex(commit->object.sha1));
|
2007-11-28 08:06:36 +00:00
|
|
|
}
|
2010-02-11 21:19:37 +00:00
|
|
|
else
|
|
|
|
strbuf_addch(&helpbuf, '.');
|
2010-02-11 21:07:06 +00:00
|
|
|
return strbuf_detach(&helpbuf, NULL);
|
2007-11-28 08:06:36 +00:00
|
|
|
}
|
|
|
|
|
2010-03-31 19:22:04 +00:00
|
|
|
static void write_message(struct strbuf *msgbuf, const char *filename)
|
|
|
|
{
|
|
|
|
static struct lock_file msg_file;
|
|
|
|
|
|
|
|
int msg_fd = hold_lock_file_for_update(&msg_file, filename,
|
|
|
|
LOCK_DIE_ON_ERROR);
|
|
|
|
if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)
|
|
|
|
die_errno("Could not write to %s.", filename);
|
|
|
|
strbuf_release(msgbuf);
|
|
|
|
if (commit_lock_file(&msg_file) < 0)
|
|
|
|
die("Error wrapping up %s", filename);
|
|
|
|
}
|
|
|
|
|
2008-09-02 21:11:15 +00:00
|
|
|
static struct tree *empty_tree(void)
|
|
|
|
{
|
|
|
|
struct tree *tree = xcalloc(1, sizeof(struct tree));
|
|
|
|
|
|
|
|
tree->object.parsed = 1;
|
|
|
|
tree->object.type = OBJ_TREE;
|
|
|
|
pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
|
|
|
|
return tree;
|
|
|
|
}
|
|
|
|
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 09:54:44 +00:00
|
|
|
static NORETURN void die_dirty_index(const char *me)
|
|
|
|
{
|
|
|
|
if (read_cache_unmerged()) {
|
|
|
|
die_resolve_conflict(me);
|
|
|
|
} else {
|
|
|
|
if (advice_commit_before_merge)
|
|
|
|
die("Your local changes would be overwritten by %s.\n"
|
|
|
|
"Please, commit your changes or stash them to proceed.", me);
|
|
|
|
else
|
|
|
|
die("Your local changes would be overwritten by %s.\n", me);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-06 20:34:42 +00:00
|
|
|
static int fast_forward_to(const unsigned char *to, const unsigned char *from)
|
|
|
|
{
|
|
|
|
struct ref_lock *ref_lock;
|
|
|
|
|
|
|
|
read_cache();
|
|
|
|
if (checkout_fast_forward(from, to))
|
|
|
|
exit(1); /* the callee should have complained already */
|
|
|
|
ref_lock = lock_any_ref_for_update("HEAD", from, 0);
|
|
|
|
return write_ref_sha1(ref_lock, to, "cherry-pick");
|
|
|
|
}
|
|
|
|
|
2010-03-31 19:22:05 +00:00
|
|
|
static void do_recursive_merge(struct commit *base, struct commit *next,
|
|
|
|
const char *base_label, const char *next_label,
|
|
|
|
unsigned char *head, struct strbuf *msgbuf,
|
|
|
|
char *defmsg)
|
|
|
|
{
|
|
|
|
struct merge_options o;
|
|
|
|
struct tree *result, *next_tree, *base_tree, *head_tree;
|
|
|
|
int clean, index_fd;
|
|
|
|
static struct lock_file index_lock;
|
|
|
|
|
|
|
|
index_fd = hold_locked_index(&index_lock, 1);
|
|
|
|
|
|
|
|
read_cache();
|
2010-08-05 11:32:41 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* NEEDSWORK: cherry-picking between branches with
|
|
|
|
* different end-of-line normalization is a pain;
|
|
|
|
* plumb in an option to set o.renormalize?
|
|
|
|
* (or better: arbitrary -X options)
|
|
|
|
*/
|
2010-03-31 19:22:05 +00:00
|
|
|
init_merge_options(&o);
|
|
|
|
o.ancestor = base ? base_label : "(empty tree)";
|
|
|
|
o.branch1 = "HEAD";
|
|
|
|
o.branch2 = next ? next_label : "(empty tree)";
|
|
|
|
|
|
|
|
head_tree = parse_tree_indirect(head);
|
|
|
|
next_tree = next ? next->tree : empty_tree();
|
|
|
|
base_tree = base ? base->tree : empty_tree();
|
|
|
|
|
|
|
|
clean = merge_trees(&o,
|
|
|
|
head_tree,
|
|
|
|
next_tree, base_tree, &result);
|
|
|
|
|
|
|
|
if (active_cache_changed &&
|
|
|
|
(write_cache(index_fd, active_cache, active_nr) ||
|
|
|
|
commit_locked_index(&index_lock)))
|
|
|
|
die("%s: Unable to write new index file", me);
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
|
|
|
|
if (!clean) {
|
|
|
|
int i;
|
|
|
|
strbuf_addstr(msgbuf, "\nConflicts:\n\n");
|
|
|
|
for (i = 0; i < active_nr;) {
|
|
|
|
struct cache_entry *ce = active_cache[i++];
|
|
|
|
if (ce_stage(ce)) {
|
|
|
|
strbuf_addch(msgbuf, '\t');
|
|
|
|
strbuf_addstr(msgbuf, ce->name);
|
|
|
|
strbuf_addch(msgbuf, '\n');
|
|
|
|
while (i < active_nr && !strcmp(ce->name,
|
|
|
|
active_cache[i]->name))
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
write_message(msgbuf, defmsg);
|
|
|
|
fprintf(stderr, "Automatic %s failed.%s\n",
|
2010-06-02 05:58:37 +00:00
|
|
|
me, help_msg());
|
2010-03-31 19:22:05 +00:00
|
|
|
rerere(allow_rerere_auto);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
write_message(msgbuf, defmsg);
|
|
|
|
fprintf(stderr, "Finished one %s.\n", me);
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:36 +00:00
|
|
|
static int do_pick_commit(void)
|
2007-03-01 04:26:30 +00:00
|
|
|
{
|
|
|
|
unsigned char head[20];
|
2007-10-23 20:33:26 +00:00
|
|
|
struct commit *base, *next, *parent;
|
2010-03-21 00:46:07 +00:00
|
|
|
const char *base_label, *next_label;
|
2010-03-21 00:45:21 +00:00
|
|
|
struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
|
2010-03-21 02:01:20 +00:00
|
|
|
char *defmsg = NULL;
|
2010-03-31 19:22:04 +00:00
|
|
|
struct strbuf msgbuf = STRBUF_INIT;
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
if (no_commit) {
|
|
|
|
/*
|
|
|
|
* We do not intend to commit immediately. We just want to
|
2007-11-13 21:45:11 +00:00
|
|
|
* merge the differences in, so let's compute the tree
|
|
|
|
* that represents the "current" state for merge-recursive
|
|
|
|
* to work on.
|
2007-03-01 04:26:30 +00:00
|
|
|
*/
|
2008-01-11 06:49:35 +00:00
|
|
|
if (write_cache_as_tree(head, 0, NULL))
|
2007-03-01 04:26:30 +00:00
|
|
|
die ("Your index file is unmerged.");
|
|
|
|
} else {
|
|
|
|
if (get_sha1("HEAD", head))
|
|
|
|
die ("You do not have a valid HEAD");
|
2009-02-10 14:30:35 +00:00
|
|
|
if (index_differs_from("HEAD", 0))
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 09:54:44 +00:00
|
|
|
die_dirty_index(me);
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
2008-09-02 21:11:15 +00:00
|
|
|
discard_cache();
|
|
|
|
|
2008-07-04 15:19:52 +00:00
|
|
|
if (!commit->parents) {
|
|
|
|
if (action == REVERT)
|
|
|
|
die ("Cannot revert a root commit");
|
|
|
|
parent = NULL;
|
|
|
|
}
|
|
|
|
else if (commit->parents->next) {
|
2007-10-23 20:33:26 +00:00
|
|
|
/* Reverting or cherry-picking a merge commit */
|
|
|
|
int cnt;
|
|
|
|
struct commit_list *p;
|
|
|
|
|
|
|
|
if (!mainline)
|
|
|
|
die("Commit %s is a merge but no -m option was given.",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
for (cnt = 1, p = commit->parents;
|
|
|
|
cnt != mainline && p;
|
|
|
|
cnt++)
|
|
|
|
p = p->next;
|
|
|
|
if (cnt != mainline || !p)
|
|
|
|
die("Commit %s does not have parent %d",
|
|
|
|
sha1_to_hex(commit->object.sha1), mainline);
|
|
|
|
parent = p->item;
|
|
|
|
} else if (0 < mainline)
|
|
|
|
die("Mainline was specified but commit %s is not a merge.",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
else
|
|
|
|
parent = commit->parents->item;
|
|
|
|
|
2010-03-06 20:34:42 +00:00
|
|
|
if (allow_ff && !hashcmp(parent->object.sha1, head))
|
|
|
|
return fast_forward_to(commit->object.sha1, head);
|
|
|
|
|
2008-09-02 21:11:15 +00:00
|
|
|
if (parent && parse_commit(parent) < 0)
|
|
|
|
die("%s: cannot parse parent commit %s",
|
|
|
|
me, sha1_to_hex(parent->object.sha1));
|
|
|
|
|
2010-03-21 00:45:21 +00:00
|
|
|
if (get_message(commit->buffer, &msg) != 0)
|
|
|
|
die("Cannot get commit message for %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
2007-03-01 04:26:30 +00:00
|
|
|
/*
|
|
|
|
* "commit" is an existing commit. We would want to apply
|
|
|
|
* the difference it introduces since its first parent "prev"
|
|
|
|
* on top of the current HEAD if we are cherry-pick. Or the
|
|
|
|
* reverse of it if we are revert.
|
|
|
|
*/
|
|
|
|
|
2010-03-21 02:01:20 +00:00
|
|
|
defmsg = git_pathdup("MERGE_MSG");
|
2010-03-06 20:34:42 +00:00
|
|
|
|
2007-03-01 04:26:30 +00:00
|
|
|
if (action == REVERT) {
|
|
|
|
base = commit;
|
2010-03-21 00:46:07 +00:00
|
|
|
base_label = msg.label;
|
2007-10-23 20:33:26 +00:00
|
|
|
next = parent;
|
2010-03-21 00:45:21 +00:00
|
|
|
next_label = msg.parent_label;
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(&msgbuf, "Revert \"");
|
|
|
|
strbuf_addstr(&msgbuf, msg.subject);
|
|
|
|
strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit ");
|
|
|
|
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
|
2008-12-21 22:17:12 +00:00
|
|
|
|
|
|
|
if (commit->parents->next) {
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
|
|
|
|
strbuf_addstr(&msgbuf, sha1_to_hex(parent->object.sha1));
|
2008-12-21 22:17:12 +00:00
|
|
|
}
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(&msgbuf, ".\n");
|
2007-03-01 04:26:30 +00:00
|
|
|
} else {
|
2007-10-23 20:33:26 +00:00
|
|
|
base = parent;
|
2010-03-21 00:46:07 +00:00
|
|
|
base_label = msg.parent_label;
|
2007-03-01 04:26:30 +00:00
|
|
|
next = commit;
|
2010-03-21 00:45:21 +00:00
|
|
|
next_label = msg.label;
|
|
|
|
set_author_ident_env(msg.message);
|
2010-03-31 19:22:04 +00:00
|
|
|
add_message_to_msg(&msgbuf, msg.message);
|
2007-10-07 21:02:29 +00:00
|
|
|
if (no_replay) {
|
2010-03-31 19:22:04 +00:00
|
|
|
strbuf_addstr(&msgbuf, "(cherry picked from commit ");
|
|
|
|
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
|
|
|
|
strbuf_addstr(&msgbuf, ")\n");
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-31 19:22:08 +00:00
|
|
|
if (!strategy || !strcmp(strategy, "recursive") || action == REVERT)
|
|
|
|
do_recursive_merge(base, next, base_label, next_label,
|
|
|
|
head, &msgbuf, defmsg);
|
|
|
|
else {
|
|
|
|
int res;
|
|
|
|
struct commit_list *common = NULL;
|
|
|
|
struct commit_list *remotes = NULL;
|
|
|
|
write_message(&msgbuf, defmsg);
|
|
|
|
commit_list_insert(base, &common);
|
|
|
|
commit_list_insert(next, &remotes);
|
|
|
|
res = try_merge_command(strategy, common,
|
|
|
|
sha1_to_hex(head), remotes);
|
|
|
|
free_commit_list(common);
|
|
|
|
free_commit_list(remotes);
|
|
|
|
if (res) {
|
|
|
|
fprintf(stderr, "Automatic %s with strategy %s failed.%s\n",
|
2010-06-02 05:58:37 +00:00
|
|
|
me, strategy, help_msg());
|
2010-03-31 19:22:08 +00:00
|
|
|
rerere(allow_rerere_auto);
|
|
|
|
exit(1);
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:35 +00:00
|
|
|
free_message(&msg);
|
|
|
|
|
2007-03-01 04:26:30 +00:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
* If we are cherry-pick, and if the merge did not result in
|
|
|
|
* hand-editing, we will hit this commit and inherit the original
|
|
|
|
* author date and name.
|
|
|
|
* If we are revert, or if our cherry-pick results in a hand merge,
|
|
|
|
* we had better say that the current user is responsible for that.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!no_commit) {
|
2008-04-26 20:14:28 +00:00
|
|
|
/* 6 is max possible length of our args array including NULL */
|
|
|
|
const char *args[6];
|
2010-06-02 05:58:35 +00:00
|
|
|
int res;
|
2008-04-26 20:14:28 +00:00
|
|
|
int i = 0;
|
2010-06-02 05:58:35 +00:00
|
|
|
|
2008-04-26 20:14:28 +00:00
|
|
|
args[i++] = "commit";
|
|
|
|
args[i++] = "-n";
|
|
|
|
if (signoff)
|
|
|
|
args[i++] = "-s";
|
|
|
|
if (!edit) {
|
|
|
|
args[i++] = "-F";
|
|
|
|
args[i++] = defmsg;
|
|
|
|
}
|
|
|
|
args[i] = NULL;
|
2010-06-02 05:58:35 +00:00
|
|
|
res = run_command_v_opt(args, RUN_GIT_CMD);
|
|
|
|
free(defmsg);
|
|
|
|
|
|
|
|
return res;
|
2007-03-01 04:26:30 +00:00
|
|
|
}
|
2010-06-02 05:58:35 +00:00
|
|
|
|
2008-10-28 17:27:33 +00:00
|
|
|
free(defmsg);
|
2007-03-01 04:26:30 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:38 +00:00
|
|
|
static void prepare_revs(struct rev_info *revs)
|
|
|
|
{
|
|
|
|
int argc = 0;
|
|
|
|
int i;
|
|
|
|
const char **argv = xmalloc((commit_argc + 4) * sizeof(*argv));
|
|
|
|
|
|
|
|
argv[argc++] = NULL;
|
|
|
|
argv[argc++] = "--no-walk";
|
|
|
|
if (action != REVERT)
|
|
|
|
argv[argc++] = "--reverse";
|
|
|
|
for (i = 0; i < commit_argc; i++)
|
|
|
|
argv[argc++] = commit_argv[i];
|
|
|
|
argv[argc++] = NULL;
|
|
|
|
|
|
|
|
init_revisions(revs, NULL);
|
|
|
|
setup_revisions(argc - 1, argv, revs, NULL);
|
|
|
|
if (prepare_revision_walk(revs))
|
|
|
|
die("revision walk setup failed");
|
|
|
|
|
|
|
|
if (!revs->commits)
|
|
|
|
die("empty commit set passed");
|
|
|
|
|
|
|
|
free(argv);
|
|
|
|
}
|
|
|
|
|
2010-06-02 05:58:36 +00:00
|
|
|
static int revert_or_cherry_pick(int argc, const char **argv)
|
|
|
|
{
|
2010-06-02 05:58:38 +00:00
|
|
|
struct rev_info revs;
|
|
|
|
|
2010-06-02 05:58:36 +00:00
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
me = action == REVERT ? "revert" : "cherry-pick";
|
|
|
|
setenv(GIT_REFLOG_ACTION, me, 0);
|
|
|
|
parse_args(argc, argv);
|
|
|
|
|
|
|
|
if (allow_ff) {
|
|
|
|
if (signoff)
|
|
|
|
die("cherry-pick --ff cannot be used with --signoff");
|
|
|
|
if (no_commit)
|
|
|
|
die("cherry-pick --ff cannot be used with --no-commit");
|
|
|
|
if (no_replay)
|
|
|
|
die("cherry-pick --ff cannot be used with -x");
|
|
|
|
if (edit)
|
|
|
|
die("cherry-pick --ff cannot be used with --edit");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (read_cache() < 0)
|
|
|
|
die("git %s: failed to read the index", me);
|
|
|
|
|
2010-06-02 05:58:38 +00:00
|
|
|
prepare_revs(&revs);
|
|
|
|
|
|
|
|
while ((commit = get_revision(&revs))) {
|
|
|
|
int res = do_pick_commit();
|
|
|
|
if (res)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2010-06-02 05:58:36 +00:00
|
|
|
}
|
|
|
|
|
2007-03-01 04:26:30 +00:00
|
|
|
int cmd_revert(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
if (isatty(0))
|
|
|
|
edit = 1;
|
|
|
|
action = REVERT;
|
|
|
|
return revert_or_cherry_pick(argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
action = CHERRY_PICK;
|
|
|
|
return revert_or_cherry_pick(argc, argv);
|
|
|
|
}
|