2011-08-04 10:39:11 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "sequencer.h"
|
|
|
|
#include "dir.h"
|
2012-01-11 18:15:57 +00:00
|
|
|
#include "object.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "run-command.h"
|
|
|
|
#include "exec_cmd.h"
|
|
|
|
#include "utf8.h"
|
|
|
|
#include "cache-tree.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "rerere.h"
|
|
|
|
#include "merge-recursive.h"
|
|
|
|
#include "refs.h"
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
#include "argv-array.h"
|
2012-01-11 18:15:57 +00:00
|
|
|
|
|
|
|
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
|
2011-08-04 10:39:11 +00:00
|
|
|
|
2012-09-14 06:52:03 +00:00
|
|
|
const char sign_off_header[] = "Signed-off-by: ";
|
2013-02-12 10:17:32 +00:00
|
|
|
static const char cherry_picked_prefix[] = "(cherry picked from commit ";
|
2012-09-14 06:52:03 +00:00
|
|
|
|
2013-02-12 10:17:34 +00:00
|
|
|
static int is_rfc2822_line(const char *buf, int len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
int ch = buf[i];
|
|
|
|
if (ch == ':')
|
|
|
|
return 1;
|
|
|
|
if (!isalnum(ch) && ch != '-')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_cherry_picked_from_line(const char *buf, int len)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We only care that it looks roughly like (cherry picked from ...)
|
|
|
|
*/
|
|
|
|
return len > strlen(cherry_picked_prefix) + 1 &&
|
|
|
|
!prefixcmp(buf, cherry_picked_prefix) && buf[len - 1] == ')';
|
|
|
|
}
|
|
|
|
|
2013-02-12 10:17:35 +00:00
|
|
|
/*
|
|
|
|
* Returns 0 for non-conforming footer
|
|
|
|
* Returns 1 for conforming footer
|
|
|
|
* Returns 2 when sob exists within conforming footer
|
|
|
|
* Returns 3 when sob exists within conforming footer as last entry
|
|
|
|
*/
|
|
|
|
static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
|
|
|
|
int ignore_footer)
|
2013-02-12 10:17:34 +00:00
|
|
|
{
|
|
|
|
char prev;
|
|
|
|
int i, k;
|
|
|
|
int len = sb->len - ignore_footer;
|
|
|
|
const char *buf = sb->buf;
|
2013-02-12 10:17:35 +00:00
|
|
|
int found_sob = 0;
|
2013-02-12 10:17:34 +00:00
|
|
|
|
|
|
|
/* footer must end with newline */
|
|
|
|
if (!len || buf[len - 1] != '\n')
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
prev = '\0';
|
|
|
|
for (i = len - 1; i > 0; i--) {
|
|
|
|
char ch = buf[i];
|
|
|
|
if (prev == '\n' && ch == '\n') /* paragraph break */
|
|
|
|
break;
|
|
|
|
prev = ch;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* require at least one blank line */
|
|
|
|
if (prev != '\n' || buf[i] != '\n')
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* advance to start of last paragraph */
|
|
|
|
while (i < len - 1 && buf[i] == '\n')
|
|
|
|
i++;
|
|
|
|
|
|
|
|
for (; i < len; i = k) {
|
2013-02-12 10:17:35 +00:00
|
|
|
int found_rfc2822;
|
|
|
|
|
2013-02-12 10:17:34 +00:00
|
|
|
for (k = i; k < len && buf[k] != '\n'; k++)
|
|
|
|
; /* do nothing */
|
|
|
|
k++;
|
|
|
|
|
2013-02-12 10:17:35 +00:00
|
|
|
found_rfc2822 = is_rfc2822_line(buf + i, k - i - 1);
|
|
|
|
if (found_rfc2822 && sob &&
|
|
|
|
!strncmp(buf + i, sob->buf, sob->len))
|
|
|
|
found_sob = k;
|
|
|
|
|
|
|
|
if (!(found_rfc2822 ||
|
|
|
|
is_cherry_picked_from_line(buf + i, k - i - 1)))
|
2013-02-12 10:17:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2013-02-12 10:17:35 +00:00
|
|
|
if (found_sob == i)
|
|
|
|
return 3;
|
|
|
|
if (found_sob)
|
|
|
|
return 2;
|
2013-02-12 10:17:34 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2012-09-14 06:52:03 +00:00
|
|
|
|
2012-09-16 06:20:40 +00:00
|
|
|
static void remove_sequencer_state(void)
|
2011-08-04 10:39:11 +00:00
|
|
|
{
|
|
|
|
struct strbuf seq_dir = STRBUF_INIT;
|
|
|
|
|
|
|
|
strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));
|
2011-12-10 13:06:12 +00:00
|
|
|
remove_dir_recursively(&seq_dir, 0);
|
2011-08-04 10:39:11 +00:00
|
|
|
strbuf_release(&seq_dir);
|
|
|
|
}
|
2012-01-11 18:15:57 +00:00
|
|
|
|
|
|
|
static const char *action_name(const struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *get_encoding(const char *message);
|
|
|
|
|
|
|
|
struct commit_message {
|
|
|
|
char *parent_label;
|
|
|
|
const char *label;
|
|
|
|
const char *subject;
|
|
|
|
char *reencoded_message;
|
|
|
|
const char *message;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int get_message(struct commit *commit, struct commit_message *out)
|
|
|
|
{
|
|
|
|
const char *encoding;
|
|
|
|
const char *abbrev, *subject;
|
|
|
|
int abbrev_len, subject_len;
|
|
|
|
char *q;
|
|
|
|
|
|
|
|
if (!commit->buffer)
|
|
|
|
return -1;
|
|
|
|
encoding = get_encoding(commit->buffer);
|
|
|
|
if (!encoding)
|
|
|
|
encoding = "UTF-8";
|
|
|
|
if (!git_commit_encoding)
|
|
|
|
git_commit_encoding = "UTF-8";
|
|
|
|
|
|
|
|
out->reencoded_message = NULL;
|
|
|
|
out->message = commit->buffer;
|
2012-10-19 05:41:56 +00:00
|
|
|
if (same_encoding(encoding, git_commit_encoding))
|
2012-01-11 18:15:57 +00:00
|
|
|
out->reencoded_message = reencode_string(commit->buffer,
|
|
|
|
git_commit_encoding, encoding);
|
|
|
|
if (out->reencoded_message)
|
|
|
|
out->message = out->reencoded_message;
|
|
|
|
|
|
|
|
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
|
|
|
|
abbrev_len = strlen(abbrev);
|
|
|
|
|
|
|
|
subject_len = find_commit_subject(out->message, &subject);
|
|
|
|
|
|
|
|
out->parent_label = xmalloc(strlen("parent of ") + abbrev_len +
|
|
|
|
strlen("... ") + subject_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, subject, subject_len);
|
|
|
|
*q = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_message(struct commit_message *msg)
|
|
|
|
{
|
|
|
|
free(msg->parent_label);
|
|
|
|
free(msg->reencoded_message);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *get_encoding(const char *message)
|
|
|
|
{
|
|
|
|
const char *p = message, *eol;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
|
|
|
|
{
|
|
|
|
const char *filename;
|
|
|
|
int fd;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
|
|
|
strbuf_addf(&buf, "%s\n", sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
filename = git_path("%s", pseudoref);
|
|
|
|
fd = open(filename, O_WRONLY | O_CREAT, 0666);
|
|
|
|
if (fd < 0)
|
|
|
|
die_errno(_("Could not open '%s' for writing"), filename);
|
|
|
|
if (write_in_full(fd, buf.buf, buf.len) != buf.len || close(fd))
|
|
|
|
die_errno(_("Could not write to '%s'"), filename);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
|
2012-02-22 00:44:17 +00:00
|
|
|
static void print_advice(int show_hint, struct replay_opts *opts)
|
2012-01-11 18:15:57 +00:00
|
|
|
{
|
|
|
|
char *msg = getenv("GIT_CHERRY_PICK_HELP");
|
|
|
|
|
|
|
|
if (msg) {
|
|
|
|
fprintf(stderr, "%s\n", msg);
|
|
|
|
/*
|
|
|
|
* A conflict has occured but the porcelain
|
|
|
|
* (typically rebase --interactive) wants to take care
|
|
|
|
* of the commit itself so remove CHERRY_PICK_HEAD
|
|
|
|
*/
|
|
|
|
unlink(git_path("CHERRY_PICK_HEAD"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-22 00:44:17 +00:00
|
|
|
if (show_hint) {
|
|
|
|
if (opts->no_commit)
|
|
|
|
advise(_("after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"));
|
|
|
|
else
|
|
|
|
advise(_("after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
|
|
"and commit the result with 'git commit'"));
|
|
|
|
}
|
2012-01-11 18:15:57 +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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct tree *empty_tree(void)
|
|
|
|
{
|
2012-03-22 18:53:24 +00:00
|
|
|
return lookup_tree(EMPTY_TREE_SHA1_BIN);
|
2012-01-11 18:15:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int error_dirty_index(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
if (read_cache_unmerged())
|
|
|
|
return error_resolve_conflict(action_name(opts));
|
|
|
|
|
|
|
|
/* Different translation strings for cherry-pick and revert */
|
|
|
|
if (opts->action == REPLAY_PICK)
|
|
|
|
error(_("Your local changes would be overwritten by cherry-pick."));
|
|
|
|
else
|
|
|
|
error(_("Your local changes would be overwritten by revert."));
|
|
|
|
|
|
|
|
if (advice_commit_before_merge)
|
|
|
|
advise(_("Commit your changes or stash them to proceed."));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-12-21 19:10:11 +00:00
|
|
|
static int fast_forward_to(const unsigned char *to, const unsigned char *from,
|
|
|
|
int unborn)
|
2012-01-11 18:15:57 +00:00
|
|
|
{
|
|
|
|
struct ref_lock *ref_lock;
|
|
|
|
|
|
|
|
read_cache();
|
2012-10-26 15:53:49 +00:00
|
|
|
if (checkout_fast_forward(from, to, 1))
|
2012-01-11 18:15:57 +00:00
|
|
|
exit(1); /* the callee should have complained already */
|
2012-12-21 19:10:11 +00:00
|
|
|
ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from, 0);
|
2012-01-11 18:15:57 +00:00
|
|
|
return write_ref_sha1(ref_lock, to, "cherry-pick");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_recursive_merge(struct commit *base, struct commit *next,
|
|
|
|
const char *base_label, const char *next_label,
|
|
|
|
unsigned char *head, struct strbuf *msgbuf,
|
|
|
|
struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct merge_options o;
|
|
|
|
struct tree *result, *next_tree, *base_tree, *head_tree;
|
|
|
|
int clean, index_fd;
|
|
|
|
const char **xopt;
|
|
|
|
static struct lock_file index_lock;
|
|
|
|
|
|
|
|
index_fd = hold_locked_index(&index_lock, 1);
|
|
|
|
|
|
|
|
read_cache();
|
|
|
|
|
|
|
|
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();
|
|
|
|
|
|
|
|
for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
|
|
|
|
parse_merge_opt(&o, *xopt);
|
|
|
|
|
|
|
|
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)))
|
|
|
|
/* TRANSLATORS: %s will be "revert" or "cherry-pick" */
|
|
|
|
die(_("%s: Unable to write new index file"), action_name(opts));
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
|
2012-09-14 06:52:03 +00:00
|
|
|
if (opts->signoff)
|
2013-02-12 10:17:35 +00:00
|
|
|
append_signoff(msgbuf, 0, 0);
|
2012-09-14 06:52:03 +00:00
|
|
|
|
2012-01-11 18:15:57 +00:00
|
|
|
if (!clean) {
|
|
|
|
int i;
|
2012-04-18 21:07:25 +00:00
|
|
|
strbuf_addstr(msgbuf, "\nConflicts:\n");
|
2012-01-11 18:15:57 +00:00
|
|
|
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++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return !clean;
|
|
|
|
}
|
|
|
|
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
static int is_index_unchanged(void)
|
|
|
|
{
|
|
|
|
unsigned char head_sha1[20];
|
|
|
|
struct commit *head_commit;
|
|
|
|
|
|
|
|
if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL))
|
|
|
|
return error(_("Could not resolve HEAD commit\n"));
|
|
|
|
|
|
|
|
head_commit = lookup_commit(head_sha1);
|
2012-05-03 12:10:22 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If head_commit is NULL, check_commit, called from
|
|
|
|
* lookup_commit, would have indicated that head_commit is not
|
|
|
|
* a commit object already. parse_commit() will return failure
|
|
|
|
* without further complaints in such a case. Otherwise, if
|
|
|
|
* the commit is invalid, parse_commit() will complain. So
|
|
|
|
* there is nothing for us to say here. Just return failure.
|
|
|
|
*/
|
|
|
|
if (parse_commit(head_commit))
|
|
|
|
return -1;
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
|
|
|
|
if (!active_cache_tree)
|
|
|
|
active_cache_tree = cache_tree();
|
|
|
|
|
|
|
|
if (!cache_tree_fully_valid(active_cache_tree))
|
|
|
|
if (cache_tree_update(active_cache_tree, active_cache,
|
|
|
|
active_nr, 0))
|
|
|
|
return error(_("Unable to update cache tree\n"));
|
|
|
|
|
|
|
|
return !hashcmp(active_cache_tree->sha1, head_commit->tree->object.sha1);
|
|
|
|
}
|
|
|
|
|
2012-01-11 18:15:57 +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.
|
|
|
|
*/
|
2012-05-30 00:14:41 +00:00
|
|
|
static int run_git_commit(const char *defmsg, struct replay_opts *opts,
|
|
|
|
int allow_empty)
|
2012-01-11 18:15:57 +00:00
|
|
|
{
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
struct argv_array array;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
argv_array_init(&array);
|
|
|
|
argv_array_push(&array, "commit");
|
|
|
|
argv_array_push(&array, "-n");
|
2012-01-11 18:15:57 +00:00
|
|
|
|
|
|
|
if (opts->signoff)
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
argv_array_push(&array, "-s");
|
2012-01-11 18:15:57 +00:00
|
|
|
if (!opts->edit) {
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
argv_array_push(&array, "-F");
|
|
|
|
argv_array_push(&array, defmsg);
|
2012-01-11 18:15:57 +00:00
|
|
|
}
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
|
2012-05-30 00:14:41 +00:00
|
|
|
if (allow_empty)
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
argv_array_push(&array, "--allow-empty");
|
2012-04-11 20:21:53 +00:00
|
|
|
|
2012-08-02 10:38:51 +00:00
|
|
|
if (opts->allow_empty_message)
|
|
|
|
argv_array_push(&array, "--allow-empty-message");
|
|
|
|
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
rc = run_command_v_opt(array.argv, RUN_GIT_CMD);
|
|
|
|
argv_array_clear(&array);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_original_commit_empty(struct commit *commit)
|
|
|
|
{
|
|
|
|
const unsigned char *ptree_sha1;
|
|
|
|
|
|
|
|
if (parse_commit(commit))
|
|
|
|
return error(_("Could not parse commit %s\n"),
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
if (commit->parents) {
|
|
|
|
struct commit *parent = commit->parents->item;
|
|
|
|
if (parse_commit(parent))
|
|
|
|
return error(_("Could not parse parent commit %s\n"),
|
|
|
|
sha1_to_hex(parent->object.sha1));
|
|
|
|
ptree_sha1 = parent->tree->object.sha1;
|
|
|
|
} else {
|
|
|
|
ptree_sha1 = EMPTY_TREE_SHA1_BIN; /* commit is root */
|
2012-01-11 18:15:57 +00:00
|
|
|
}
|
|
|
|
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-20 14:36:15 +00:00
|
|
|
return !hashcmp(ptree_sha1, commit->tree->object.sha1);
|
2012-01-11 18:15:57 +00:00
|
|
|
}
|
|
|
|
|
2012-05-30 00:14:41 +00:00
|
|
|
/*
|
|
|
|
* Do we run "git commit" with "--allow-empty"?
|
|
|
|
*/
|
|
|
|
static int allow_empty(struct replay_opts *opts, struct commit *commit)
|
|
|
|
{
|
|
|
|
int index_unchanged, empty_commit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Three cases:
|
|
|
|
*
|
|
|
|
* (1) we do not allow empty at all and error out.
|
|
|
|
*
|
|
|
|
* (2) we allow ones that were initially empty, but
|
|
|
|
* forbid the ones that become empty;
|
|
|
|
*
|
|
|
|
* (3) we allow both.
|
|
|
|
*/
|
|
|
|
if (!opts->allow_empty)
|
|
|
|
return 0; /* let "git commit" barf as necessary */
|
|
|
|
|
|
|
|
index_unchanged = is_index_unchanged();
|
|
|
|
if (index_unchanged < 0)
|
|
|
|
return index_unchanged;
|
|
|
|
if (!index_unchanged)
|
|
|
|
return 0; /* we do not have to say --allow-empty */
|
|
|
|
|
|
|
|
if (opts->keep_redundant_commits)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
empty_commit = is_original_commit_empty(commit);
|
|
|
|
if (empty_commit < 0)
|
|
|
|
return empty_commit;
|
|
|
|
if (!empty_commit)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-01-11 18:15:57 +00:00
|
|
|
static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
unsigned char head[20];
|
|
|
|
struct commit *base, *next, *parent;
|
|
|
|
const char *base_label, *next_label;
|
|
|
|
struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
|
|
|
|
char *defmsg = NULL;
|
|
|
|
struct strbuf msgbuf = STRBUF_INIT;
|
2012-12-21 19:10:11 +00:00
|
|
|
int res, unborn = 0;
|
2012-01-11 18:15:57 +00:00
|
|
|
|
|
|
|
if (opts->no_commit) {
|
|
|
|
/*
|
|
|
|
* We do not intend to commit immediately. We just want to
|
|
|
|
* merge the differences in, so let's compute the tree
|
|
|
|
* that represents the "current" state for merge-recursive
|
|
|
|
* to work on.
|
|
|
|
*/
|
|
|
|
if (write_cache_as_tree(head, 0, NULL))
|
|
|
|
die (_("Your index file is unmerged."));
|
|
|
|
} else {
|
2012-12-21 19:10:11 +00:00
|
|
|
unborn = get_sha1("HEAD", head);
|
|
|
|
if (unborn)
|
|
|
|
hashcpy(head, EMPTY_TREE_SHA1_BIN);
|
|
|
|
if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0))
|
2012-01-11 18:15:57 +00:00
|
|
|
return error_dirty_index(opts);
|
|
|
|
}
|
|
|
|
discard_cache();
|
|
|
|
|
|
|
|
if (!commit->parents) {
|
|
|
|
parent = NULL;
|
|
|
|
}
|
|
|
|
else if (commit->parents->next) {
|
|
|
|
/* Reverting or cherry-picking a merge commit */
|
|
|
|
int cnt;
|
|
|
|
struct commit_list *p;
|
|
|
|
|
|
|
|
if (!opts->mainline)
|
|
|
|
return error(_("Commit %s is a merge but no -m option was given."),
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
for (cnt = 1, p = commit->parents;
|
|
|
|
cnt != opts->mainline && p;
|
|
|
|
cnt++)
|
|
|
|
p = p->next;
|
|
|
|
if (cnt != opts->mainline || !p)
|
|
|
|
return error(_("Commit %s does not have parent %d"),
|
|
|
|
sha1_to_hex(commit->object.sha1), opts->mainline);
|
|
|
|
parent = p->item;
|
|
|
|
} else if (0 < opts->mainline)
|
|
|
|
return error(_("Mainline was specified but commit %s is not a merge."),
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
else
|
|
|
|
parent = commit->parents->item;
|
|
|
|
|
2012-12-21 19:10:11 +00:00
|
|
|
if (opts->allow_ff &&
|
|
|
|
((parent && !hashcmp(parent->object.sha1, head)) ||
|
|
|
|
(!parent && unborn)))
|
|
|
|
return fast_forward_to(commit->object.sha1, head, unborn);
|
2012-01-11 18:15:57 +00:00
|
|
|
|
|
|
|
if (parent && parse_commit(parent) < 0)
|
|
|
|
/* TRANSLATORS: The first %s will be "revert" or
|
|
|
|
"cherry-pick", the second %s a SHA1 */
|
|
|
|
return error(_("%s: cannot parse parent commit %s"),
|
|
|
|
action_name(opts), sha1_to_hex(parent->object.sha1));
|
|
|
|
|
|
|
|
if (get_message(commit, &msg) != 0)
|
|
|
|
return error(_("Cannot get commit message for %s"),
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
defmsg = git_pathdup("MERGE_MSG");
|
|
|
|
|
|
|
|
if (opts->action == REPLAY_REVERT) {
|
|
|
|
base = commit;
|
|
|
|
base_label = msg.label;
|
|
|
|
next = parent;
|
|
|
|
next_label = msg.parent_label;
|
|
|
|
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));
|
|
|
|
|
|
|
|
if (commit->parents && commit->parents->next) {
|
|
|
|
strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
|
|
|
|
strbuf_addstr(&msgbuf, sha1_to_hex(parent->object.sha1));
|
|
|
|
}
|
|
|
|
strbuf_addstr(&msgbuf, ".\n");
|
|
|
|
} else {
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
base = parent;
|
|
|
|
base_label = msg.parent_label;
|
|
|
|
next = commit;
|
|
|
|
next_label = msg.label;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Append the commit log message to msgbuf; it starts
|
|
|
|
* after the tree, parent, author, committer
|
|
|
|
* information followed by "\n\n".
|
|
|
|
*/
|
|
|
|
p = strstr(msg.message, "\n\n");
|
|
|
|
if (p) {
|
|
|
|
p += 2;
|
|
|
|
strbuf_addstr(&msgbuf, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opts->record_origin) {
|
2013-02-12 10:17:35 +00:00
|
|
|
if (!has_conforming_footer(&msgbuf, NULL, 0))
|
2013-02-12 10:17:34 +00:00
|
|
|
strbuf_addch(&msgbuf, '\n');
|
2013-02-12 10:17:32 +00:00
|
|
|
strbuf_addstr(&msgbuf, cherry_picked_prefix);
|
2012-01-11 18:15:57 +00:00
|
|
|
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
|
|
|
|
strbuf_addstr(&msgbuf, ")\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REPLAY_REVERT) {
|
|
|
|
res = do_recursive_merge(base, next, base_label, next_label,
|
|
|
|
head, &msgbuf, opts);
|
|
|
|
write_message(&msgbuf, defmsg);
|
|
|
|
} else {
|
|
|
|
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(opts->strategy, opts->xopts_nr, opts->xopts,
|
|
|
|
common, sha1_to_hex(head), remotes);
|
|
|
|
free_commit_list(common);
|
|
|
|
free_commit_list(remotes);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the merge was clean or if it failed due to conflict, we write
|
|
|
|
* CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
|
|
|
|
* However, if the merge did not even start, then we don't want to
|
|
|
|
* write it at all.
|
|
|
|
*/
|
|
|
|
if (opts->action == REPLAY_PICK && !opts->no_commit && (res == 0 || res == 1))
|
|
|
|
write_cherry_pick_head(commit, "CHERRY_PICK_HEAD");
|
|
|
|
if (opts->action == REPLAY_REVERT && ((opts->no_commit && res == 0) || res == 1))
|
|
|
|
write_cherry_pick_head(commit, "REVERT_HEAD");
|
|
|
|
|
|
|
|
if (res) {
|
|
|
|
error(opts->action == REPLAY_REVERT
|
|
|
|
? _("could not revert %s... %s")
|
|
|
|
: _("could not apply %s... %s"),
|
|
|
|
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
|
|
|
|
msg.subject);
|
2012-02-22 00:44:17 +00:00
|
|
|
print_advice(res == 1, opts);
|
2012-01-11 18:15:57 +00:00
|
|
|
rerere(opts->allow_rerere_auto);
|
|
|
|
} else {
|
2012-05-30 00:14:41 +00:00
|
|
|
int allow = allow_empty(opts, commit);
|
|
|
|
if (allow < 0)
|
|
|
|
return allow;
|
2012-01-11 18:15:57 +00:00
|
|
|
if (!opts->no_commit)
|
2012-05-30 00:14:41 +00:00
|
|
|
res = run_git_commit(defmsg, opts, allow);
|
2012-01-11 18:15:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free_message(&msg);
|
|
|
|
free(defmsg);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void prepare_revs(struct replay_opts *opts)
|
|
|
|
{
|
2012-08-29 06:15:56 +00:00
|
|
|
/*
|
|
|
|
* picking (but not reverting) ranges (but not individual revisions)
|
|
|
|
* should be done in reverse
|
|
|
|
*/
|
|
|
|
if (opts->action == REPLAY_PICK && !opts->revs->no_walk)
|
2012-01-11 18:15:57 +00:00
|
|
|
opts->revs->reverse ^= 1;
|
|
|
|
|
|
|
|
if (prepare_revision_walk(opts->revs))
|
|
|
|
die(_("revision walk setup failed"));
|
|
|
|
|
|
|
|
if (!opts->revs->commits)
|
|
|
|
die(_("empty commit set passed"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_and_refresh_cache(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
static struct lock_file index_lock;
|
|
|
|
int index_fd = hold_locked_index(&index_lock, 0);
|
|
|
|
if (read_index_preload(&the_index, NULL) < 0)
|
|
|
|
die(_("git %s: failed to read the index"), action_name(opts));
|
|
|
|
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
|
|
|
|
if (the_index.cache_changed) {
|
|
|
|
if (write_index(&the_index, index_fd) ||
|
|
|
|
commit_locked_index(&index_lock))
|
|
|
|
die(_("git %s: failed to refresh the index"), action_name(opts));
|
|
|
|
}
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int format_todo(struct strbuf *buf, struct commit_list *todo_list,
|
|
|
|
struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit_list *cur = NULL;
|
|
|
|
const char *sha1_abbrev = NULL;
|
|
|
|
const char *action_str = opts->action == REPLAY_REVERT ? "revert" : "pick";
|
|
|
|
const char *subject;
|
|
|
|
int subject_len;
|
|
|
|
|
|
|
|
for (cur = todo_list; cur; cur = cur->next) {
|
|
|
|
sha1_abbrev = find_unique_abbrev(cur->item->object.sha1, DEFAULT_ABBREV);
|
|
|
|
subject_len = find_commit_subject(cur->item->buffer, &subject);
|
|
|
|
strbuf_addf(buf, "%s %s %.*s\n", action_str, sha1_abbrev,
|
|
|
|
subject_len, subject);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
unsigned char commit_sha1[20];
|
|
|
|
enum replay_action action;
|
|
|
|
char *end_of_object_name;
|
|
|
|
int saved, status, padding;
|
|
|
|
|
|
|
|
if (!prefixcmp(bol, "pick")) {
|
|
|
|
action = REPLAY_PICK;
|
|
|
|
bol += strlen("pick");
|
|
|
|
} else if (!prefixcmp(bol, "revert")) {
|
|
|
|
action = REPLAY_REVERT;
|
|
|
|
bol += strlen("revert");
|
|
|
|
} else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Eat up extra spaces/ tabs before object name */
|
|
|
|
padding = strspn(bol, " \t");
|
|
|
|
if (!padding)
|
|
|
|
return NULL;
|
|
|
|
bol += padding;
|
|
|
|
|
|
|
|
end_of_object_name = bol + strcspn(bol, " \t\n");
|
|
|
|
saved = *end_of_object_name;
|
|
|
|
*end_of_object_name = '\0';
|
|
|
|
status = get_sha1(bol, commit_sha1);
|
|
|
|
*end_of_object_name = saved;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify that the action matches up with the one in
|
|
|
|
* opts; we don't support arbitrary instructions
|
|
|
|
*/
|
|
|
|
if (action != opts->action) {
|
|
|
|
const char *action_str;
|
|
|
|
action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";
|
|
|
|
error(_("Cannot %s during a %s"), action_str, action_name(opts));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (status < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return lookup_commit_reference(commit_sha1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_insn_buffer(char *buf, struct commit_list **todo_list,
|
|
|
|
struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit_list **next = todo_list;
|
|
|
|
struct commit *commit;
|
|
|
|
char *p = buf;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 1; *p; i++) {
|
|
|
|
char *eol = strchrnul(p, '\n');
|
|
|
|
commit = parse_insn_line(p, eol, opts);
|
|
|
|
if (!commit)
|
|
|
|
return error(_("Could not parse line %d."), i);
|
|
|
|
next = commit_list_append(commit, next);
|
|
|
|
p = *eol ? eol + 1 : eol;
|
|
|
|
}
|
|
|
|
if (!*todo_list)
|
|
|
|
return error(_("No commits parsed."));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_populate_todo(struct commit_list **todo_list,
|
|
|
|
struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
const char *todo_file = git_path(SEQ_TODO_FILE);
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int fd, res;
|
|
|
|
|
|
|
|
fd = open(todo_file, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
die_errno(_("Could not open %s"), todo_file);
|
|
|
|
if (strbuf_read(&buf, fd, 0) < 0) {
|
|
|
|
close(fd);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
die(_("Could not read %s."), todo_file);
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
res = parse_insn_buffer(buf.buf, todo_list, opts);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
if (res)
|
|
|
|
die(_("Unusable instruction sheet: %s"), todo_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int populate_opts_cb(const char *key, const char *value, void *data)
|
|
|
|
{
|
|
|
|
struct replay_opts *opts = data;
|
|
|
|
int error_flag = 1;
|
|
|
|
|
|
|
|
if (!value)
|
|
|
|
error_flag = 0;
|
|
|
|
else if (!strcmp(key, "options.no-commit"))
|
|
|
|
opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
|
|
|
|
else if (!strcmp(key, "options.edit"))
|
|
|
|
opts->edit = git_config_bool_or_int(key, value, &error_flag);
|
|
|
|
else if (!strcmp(key, "options.signoff"))
|
|
|
|
opts->signoff = git_config_bool_or_int(key, value, &error_flag);
|
|
|
|
else if (!strcmp(key, "options.record-origin"))
|
|
|
|
opts->record_origin = git_config_bool_or_int(key, value, &error_flag);
|
|
|
|
else if (!strcmp(key, "options.allow-ff"))
|
|
|
|
opts->allow_ff = git_config_bool_or_int(key, value, &error_flag);
|
|
|
|
else if (!strcmp(key, "options.mainline"))
|
|
|
|
opts->mainline = git_config_int(key, value);
|
|
|
|
else if (!strcmp(key, "options.strategy"))
|
|
|
|
git_config_string(&opts->strategy, key, value);
|
|
|
|
else if (!strcmp(key, "options.strategy-option")) {
|
|
|
|
ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
|
|
|
|
opts->xopts[opts->xopts_nr++] = xstrdup(value);
|
|
|
|
} else
|
|
|
|
return error(_("Invalid key: %s"), key);
|
|
|
|
|
|
|
|
if (!error_flag)
|
|
|
|
return error(_("Invalid value for %s: %s"), key, value);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_populate_opts(struct replay_opts **opts_ptr)
|
|
|
|
{
|
|
|
|
const char *opts_file = git_path(SEQ_OPTS_FILE);
|
|
|
|
|
|
|
|
if (!file_exists(opts_file))
|
|
|
|
return;
|
|
|
|
if (git_config_from_file(populate_opts_cb, opts_file, *opts_ptr) < 0)
|
|
|
|
die(_("Malformed options sheet: %s"), opts_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void walk_revs_populate_todo(struct commit_list **todo_list,
|
|
|
|
struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
struct commit_list **next;
|
|
|
|
|
|
|
|
prepare_revs(opts);
|
|
|
|
|
|
|
|
next = todo_list;
|
|
|
|
while ((commit = get_revision(opts->revs)))
|
|
|
|
next = commit_list_append(commit, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int create_seq_dir(void)
|
|
|
|
{
|
|
|
|
const char *seq_dir = git_path(SEQ_DIR);
|
|
|
|
|
|
|
|
if (file_exists(seq_dir)) {
|
|
|
|
error(_("a cherry-pick or revert is already in progress"));
|
|
|
|
advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else if (mkdir(seq_dir, 0777) < 0)
|
|
|
|
die_errno(_("Could not create sequencer directory %s"), seq_dir);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void save_head(const char *head)
|
|
|
|
{
|
|
|
|
const char *head_file = git_path(SEQ_HEAD_FILE);
|
|
|
|
static struct lock_file head_lock;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = hold_lock_file_for_update(&head_lock, head_file, LOCK_DIE_ON_ERROR);
|
|
|
|
strbuf_addf(&buf, "%s\n", head);
|
|
|
|
if (write_in_full(fd, buf.buf, buf.len) < 0)
|
|
|
|
die_errno(_("Could not write to %s"), head_file);
|
|
|
|
if (commit_lock_file(&head_lock) < 0)
|
|
|
|
die(_("Error wrapping up %s."), head_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int reset_for_rollback(const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
const char *argv[4]; /* reset --merge <arg> + NULL */
|
|
|
|
argv[0] = "reset";
|
|
|
|
argv[1] = "--merge";
|
|
|
|
argv[2] = sha1_to_hex(sha1);
|
|
|
|
argv[3] = NULL;
|
|
|
|
return run_command_v_opt(argv, RUN_GIT_CMD);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rollback_single_pick(void)
|
|
|
|
{
|
|
|
|
unsigned char head_sha1[20];
|
|
|
|
|
|
|
|
if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
|
|
|
|
!file_exists(git_path("REVERT_HEAD")))
|
|
|
|
return error(_("no cherry-pick or revert in progress"));
|
|
|
|
if (read_ref_full("HEAD", head_sha1, 0, NULL))
|
|
|
|
return error(_("cannot resolve HEAD"));
|
|
|
|
if (is_null_sha1(head_sha1))
|
|
|
|
return error(_("cannot abort from a branch yet to be born"));
|
|
|
|
return reset_for_rollback(head_sha1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sequencer_rollback(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
const char *filename;
|
|
|
|
FILE *f;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
|
|
|
filename = git_path(SEQ_HEAD_FILE);
|
|
|
|
f = fopen(filename, "r");
|
|
|
|
if (!f && errno == ENOENT) {
|
|
|
|
/*
|
|
|
|
* There is no multiple-cherry-pick in progress.
|
|
|
|
* If CHERRY_PICK_HEAD or REVERT_HEAD indicates
|
|
|
|
* a single-cherry-pick in progress, abort that.
|
|
|
|
*/
|
|
|
|
return rollback_single_pick();
|
|
|
|
}
|
|
|
|
if (!f)
|
|
|
|
return error(_("cannot open %s: %s"), filename,
|
|
|
|
strerror(errno));
|
|
|
|
if (strbuf_getline(&buf, f, '\n')) {
|
|
|
|
error(_("cannot read %s: %s"), filename, ferror(f) ?
|
|
|
|
strerror(errno) : _("unexpected end of file"));
|
|
|
|
fclose(f);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
fclose(f);
|
|
|
|
if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
|
|
|
|
error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
|
|
|
|
filename);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (reset_for_rollback(sha1))
|
|
|
|
goto fail;
|
|
|
|
remove_sequencer_state();
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void save_todo(struct commit_list *todo_list, struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
const char *todo_file = git_path(SEQ_TODO_FILE);
|
|
|
|
static struct lock_file todo_lock;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = hold_lock_file_for_update(&todo_lock, todo_file, LOCK_DIE_ON_ERROR);
|
|
|
|
if (format_todo(&buf, todo_list, opts) < 0)
|
|
|
|
die(_("Could not format %s."), todo_file);
|
|
|
|
if (write_in_full(fd, buf.buf, buf.len) < 0) {
|
|
|
|
strbuf_release(&buf);
|
|
|
|
die_errno(_("Could not write to %s"), todo_file);
|
|
|
|
}
|
|
|
|
if (commit_lock_file(&todo_lock) < 0) {
|
|
|
|
strbuf_release(&buf);
|
|
|
|
die(_("Error wrapping up %s."), todo_file);
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void save_opts(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
const char *opts_file = git_path(SEQ_OPTS_FILE);
|
|
|
|
|
|
|
|
if (opts->no_commit)
|
|
|
|
git_config_set_in_file(opts_file, "options.no-commit", "true");
|
|
|
|
if (opts->edit)
|
|
|
|
git_config_set_in_file(opts_file, "options.edit", "true");
|
|
|
|
if (opts->signoff)
|
|
|
|
git_config_set_in_file(opts_file, "options.signoff", "true");
|
|
|
|
if (opts->record_origin)
|
|
|
|
git_config_set_in_file(opts_file, "options.record-origin", "true");
|
|
|
|
if (opts->allow_ff)
|
|
|
|
git_config_set_in_file(opts_file, "options.allow-ff", "true");
|
|
|
|
if (opts->mainline) {
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
strbuf_addf(&buf, "%d", opts->mainline);
|
|
|
|
git_config_set_in_file(opts_file, "options.mainline", buf.buf);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
if (opts->strategy)
|
|
|
|
git_config_set_in_file(opts_file, "options.strategy", opts->strategy);
|
|
|
|
if (opts->xopts) {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < opts->xopts_nr; i++)
|
|
|
|
git_config_set_multivar_in_file(opts_file,
|
|
|
|
"options.strategy-option",
|
|
|
|
opts->xopts[i], "^$", 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit_list *cur;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
|
|
|
|
if (opts->allow_ff)
|
|
|
|
assert(!(opts->signoff || opts->no_commit ||
|
|
|
|
opts->record_origin || opts->edit));
|
|
|
|
read_and_refresh_cache(opts);
|
|
|
|
|
|
|
|
for (cur = todo_list; cur; cur = cur->next) {
|
|
|
|
save_todo(cur, opts);
|
|
|
|
res = do_pick_commit(cur->item, opts);
|
|
|
|
if (res)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sequence of picks finished successfully; cleanup by
|
|
|
|
* removing the .git/sequencer directory
|
|
|
|
*/
|
|
|
|
remove_sequencer_state();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int continue_single_pick(void)
|
|
|
|
{
|
|
|
|
const char *argv[] = { "commit", NULL };
|
|
|
|
|
|
|
|
if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
|
|
|
|
!file_exists(git_path("REVERT_HEAD")))
|
|
|
|
return error(_("no cherry-pick or revert in progress"));
|
|
|
|
return run_command_v_opt(argv, RUN_GIT_CMD);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sequencer_continue(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit_list *todo_list = NULL;
|
|
|
|
|
|
|
|
if (!file_exists(git_path(SEQ_TODO_FILE)))
|
|
|
|
return continue_single_pick();
|
|
|
|
read_populate_opts(&opts);
|
|
|
|
read_populate_todo(&todo_list, opts);
|
|
|
|
|
|
|
|
/* Verify that the conflict has been resolved */
|
|
|
|
if (file_exists(git_path("CHERRY_PICK_HEAD")) ||
|
|
|
|
file_exists(git_path("REVERT_HEAD"))) {
|
|
|
|
int ret = continue_single_pick();
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (index_differs_from("HEAD", 0))
|
|
|
|
return error_dirty_index(opts);
|
|
|
|
todo_list = todo_list->next;
|
|
|
|
return pick_commits(todo_list, opts);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int single_pick(struct commit *cmit, struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
|
|
|
|
return do_pick_commit(cmit, opts);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sequencer_pick_revisions(struct replay_opts *opts)
|
|
|
|
{
|
|
|
|
struct commit_list *todo_list = NULL;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
if (opts->subcommand == REPLAY_NONE)
|
|
|
|
assert(opts->revs);
|
|
|
|
|
|
|
|
read_and_refresh_cache(opts);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decide what to do depending on the arguments; a fresh
|
|
|
|
* cherry-pick should be handled differently from an existing
|
|
|
|
* one that is being continued
|
|
|
|
*/
|
|
|
|
if (opts->subcommand == REPLAY_REMOVE_STATE) {
|
|
|
|
remove_sequencer_state();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (opts->subcommand == REPLAY_ROLLBACK)
|
|
|
|
return sequencer_rollback(opts);
|
|
|
|
if (opts->subcommand == REPLAY_CONTINUE)
|
|
|
|
return sequencer_continue(opts);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we were called as "git cherry-pick <commit>", just
|
|
|
|
* cherry-pick/revert it, set CHERRY_PICK_HEAD /
|
|
|
|
* REVERT_HEAD, and don't touch the sequencer state.
|
|
|
|
* This means it is possible to cherry-pick in the middle
|
|
|
|
* of a cherry-pick sequence.
|
|
|
|
*/
|
|
|
|
if (opts->revs->cmdline.nr == 1 &&
|
|
|
|
opts->revs->cmdline.rev->whence == REV_CMD_REV &&
|
|
|
|
opts->revs->no_walk &&
|
|
|
|
!opts->revs->cmdline.rev->flags) {
|
|
|
|
struct commit *cmit;
|
|
|
|
if (prepare_revision_walk(opts->revs))
|
|
|
|
die(_("revision walk setup failed"));
|
|
|
|
cmit = get_revision(opts->revs);
|
|
|
|
if (!cmit || get_revision(opts->revs))
|
|
|
|
die("BUG: expected exactly one commit from walk");
|
|
|
|
return single_pick(cmit, opts);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Start a new cherry-pick/ revert sequence; but
|
|
|
|
* first, make sure that an existing one isn't in
|
|
|
|
* progress
|
|
|
|
*/
|
|
|
|
|
|
|
|
walk_revs_populate_todo(&todo_list, opts);
|
|
|
|
if (create_seq_dir() < 0)
|
|
|
|
return -1;
|
|
|
|
if (get_sha1("HEAD", sha1)) {
|
|
|
|
if (opts->action == REPLAY_REVERT)
|
|
|
|
return error(_("Can't revert as initial commit"));
|
|
|
|
return error(_("Can't cherry-pick into empty head"));
|
|
|
|
}
|
|
|
|
save_head(sha1_to_hex(sha1));
|
|
|
|
save_opts(opts);
|
|
|
|
return pick_commits(todo_list, opts);
|
|
|
|
}
|
2012-09-14 06:52:03 +00:00
|
|
|
|
2013-02-12 10:17:35 +00:00
|
|
|
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
|
2012-09-14 06:52:03 +00:00
|
|
|
{
|
2013-02-12 10:17:35 +00:00
|
|
|
unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
|
2012-09-14 06:52:03 +00:00
|
|
|
struct strbuf sob = STRBUF_INIT;
|
2013-02-12 10:17:35 +00:00
|
|
|
int has_footer;
|
2012-09-14 06:52:03 +00:00
|
|
|
|
|
|
|
strbuf_addstr(&sob, sign_off_header);
|
|
|
|
strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
|
|
|
|
getenv("GIT_COMMITTER_EMAIL")));
|
|
|
|
strbuf_addch(&sob, '\n');
|
2013-02-12 10:17:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the whole message buffer is equal to the sob, pretend that we
|
|
|
|
* found a conforming footer with a matching sob
|
|
|
|
*/
|
|
|
|
if (msgbuf->len - ignore_footer == sob.len &&
|
|
|
|
!strncmp(msgbuf->buf, sob.buf, sob.len))
|
|
|
|
has_footer = 3;
|
|
|
|
else
|
|
|
|
has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);
|
|
|
|
|
2013-02-12 10:33:42 +00:00
|
|
|
if (!has_footer) {
|
|
|
|
const char *append_newlines = NULL;
|
|
|
|
size_t len = msgbuf->len - ignore_footer;
|
|
|
|
|
2013-02-22 22:05:27 +00:00
|
|
|
if (!len) {
|
|
|
|
/*
|
|
|
|
* The buffer is completely empty. Leave foom for
|
|
|
|
* the title and body to be filled in by the user.
|
|
|
|
*/
|
2013-02-12 10:33:42 +00:00
|
|
|
append_newlines = "\n\n";
|
2013-02-22 22:05:27 +00:00
|
|
|
} else if (msgbuf->buf[len - 1] != '\n') {
|
|
|
|
/*
|
|
|
|
* Incomplete line. Complete the line and add a
|
|
|
|
* blank one so that there is an empty line between
|
|
|
|
* the message body and the sob.
|
|
|
|
*/
|
|
|
|
append_newlines = "\n\n";
|
|
|
|
} else if (len == 1) {
|
|
|
|
/*
|
|
|
|
* Buffer contains a single newline. Add another
|
|
|
|
* so that we leave room for the title and body.
|
|
|
|
*/
|
|
|
|
append_newlines = "\n";
|
|
|
|
} else if (msgbuf->buf[len - 2] != '\n') {
|
|
|
|
/*
|
|
|
|
* Buffer ends with a single newline. Add another
|
|
|
|
* so that there is an empty line between the message
|
|
|
|
* body and the sob.
|
|
|
|
*/
|
2013-02-12 10:33:42 +00:00
|
|
|
append_newlines = "\n";
|
2013-02-22 22:05:27 +00:00
|
|
|
} /* else, the buffer already ends with two newlines. */
|
2013-02-12 10:33:42 +00:00
|
|
|
|
|
|
|
if (append_newlines)
|
|
|
|
strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
|
|
|
|
append_newlines, strlen(append_newlines));
|
2012-09-14 06:52:03 +00:00
|
|
|
}
|
2013-02-12 10:17:35 +00:00
|
|
|
|
|
|
|
if (has_footer != 3 && (!no_dup_sob || has_footer != 2))
|
|
|
|
strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
|
|
|
|
sob.buf, sob.len);
|
|
|
|
|
2012-09-14 06:52:03 +00:00
|
|
|
strbuf_release(&sob);
|
|
|
|
}
|