sequencer.con commit sequencer: teach write_message() to append an optional LF (f56fffe)
   1#include "cache.h"
   2#include "lockfile.h"
   3#include "sequencer.h"
   4#include "dir.h"
   5#include "object.h"
   6#include "commit.h"
   7#include "tag.h"
   8#include "run-command.h"
   9#include "exec_cmd.h"
  10#include "utf8.h"
  11#include "cache-tree.h"
  12#include "diff.h"
  13#include "revision.h"
  14#include "rerere.h"
  15#include "merge-recursive.h"
  16#include "refs.h"
  17#include "argv-array.h"
  18#include "quote.h"
  19
  20#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
  21
  22const char sign_off_header[] = "Signed-off-by: ";
  23static const char cherry_picked_prefix[] = "(cherry picked from commit ";
  24
  25GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
  26
  27static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo")
  28static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts")
  29static GIT_PATH_FUNC(git_path_head_file, "sequencer/head")
  30
  31/*
  32 * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
  33 * GIT_AUTHOR_DATE that will be used for the commit that is currently
  34 * being rebased.
  35 */
  36static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
  37/*
  38 * The following files are written by git-rebase just after parsing the
  39 * command-line (and are only consumed, not modified, by the sequencer).
  40 */
  41static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
  42
  43/* We will introduce the 'interactive rebase' mode later */
  44static inline int is_rebase_i(const struct replay_opts *opts)
  45{
  46        return 0;
  47}
  48
  49static const char *get_dir(const struct replay_opts *opts)
  50{
  51        return git_path_seq_dir();
  52}
  53
  54static const char *get_todo_path(const struct replay_opts *opts)
  55{
  56        return git_path_todo_file();
  57}
  58
  59static int is_rfc2822_line(const char *buf, int len)
  60{
  61        int i;
  62
  63        for (i = 0; i < len; i++) {
  64                int ch = buf[i];
  65                if (ch == ':')
  66                        return 1;
  67                if (!isalnum(ch) && ch != '-')
  68                        break;
  69        }
  70
  71        return 0;
  72}
  73
  74static int is_cherry_picked_from_line(const char *buf, int len)
  75{
  76        /*
  77         * We only care that it looks roughly like (cherry picked from ...)
  78         */
  79        return len > strlen(cherry_picked_prefix) + 1 &&
  80                starts_with(buf, cherry_picked_prefix) && buf[len - 1] == ')';
  81}
  82
  83/*
  84 * Returns 0 for non-conforming footer
  85 * Returns 1 for conforming footer
  86 * Returns 2 when sob exists within conforming footer
  87 * Returns 3 when sob exists within conforming footer as last entry
  88 */
  89static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
  90        int ignore_footer)
  91{
  92        char prev;
  93        int i, k;
  94        int len = sb->len - ignore_footer;
  95        const char *buf = sb->buf;
  96        int found_sob = 0;
  97
  98        /* footer must end with newline */
  99        if (!len || buf[len - 1] != '\n')
 100                return 0;
 101
 102        prev = '\0';
 103        for (i = len - 1; i > 0; i--) {
 104                char ch = buf[i];
 105                if (prev == '\n' && ch == '\n') /* paragraph break */
 106                        break;
 107                prev = ch;
 108        }
 109
 110        /* require at least one blank line */
 111        if (prev != '\n' || buf[i] != '\n')
 112                return 0;
 113
 114        /* advance to start of last paragraph */
 115        while (i < len - 1 && buf[i] == '\n')
 116                i++;
 117
 118        for (; i < len; i = k) {
 119                int found_rfc2822;
 120
 121                for (k = i; k < len && buf[k] != '\n'; k++)
 122                        ; /* do nothing */
 123                k++;
 124
 125                found_rfc2822 = is_rfc2822_line(buf + i, k - i - 1);
 126                if (found_rfc2822 && sob &&
 127                    !strncmp(buf + i, sob->buf, sob->len))
 128                        found_sob = k;
 129
 130                if (!(found_rfc2822 ||
 131                      is_cherry_picked_from_line(buf + i, k - i - 1)))
 132                        return 0;
 133        }
 134        if (found_sob == i)
 135                return 3;
 136        if (found_sob)
 137                return 2;
 138        return 1;
 139}
 140
 141static const char *gpg_sign_opt_quoted(struct replay_opts *opts)
 142{
 143        static struct strbuf buf = STRBUF_INIT;
 144
 145        strbuf_reset(&buf);
 146        if (opts->gpg_sign)
 147                sq_quotef(&buf, "-S%s", opts->gpg_sign);
 148        return buf.buf;
 149}
 150
 151int sequencer_remove_state(struct replay_opts *opts)
 152{
 153        struct strbuf dir = STRBUF_INIT;
 154        int i;
 155
 156        free(opts->gpg_sign);
 157        free(opts->strategy);
 158        for (i = 0; i < opts->xopts_nr; i++)
 159                free(opts->xopts[i]);
 160        free(opts->xopts);
 161
 162        strbuf_addf(&dir, "%s", get_dir(opts));
 163        remove_dir_recursively(&dir, 0);
 164        strbuf_release(&dir);
 165
 166        return 0;
 167}
 168
 169static const char *action_name(const struct replay_opts *opts)
 170{
 171        return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
 172}
 173
 174struct commit_message {
 175        char *parent_label;
 176        char *label;
 177        char *subject;
 178        const char *message;
 179};
 180
 181static const char *short_commit_name(struct commit *commit)
 182{
 183        return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
 184}
 185
 186static int get_message(struct commit *commit, struct commit_message *out)
 187{
 188        const char *abbrev, *subject;
 189        int subject_len;
 190
 191        out->message = logmsg_reencode(commit, NULL, get_commit_output_encoding());
 192        abbrev = short_commit_name(commit);
 193
 194        subject_len = find_commit_subject(out->message, &subject);
 195
 196        out->subject = xmemdupz(subject, subject_len);
 197        out->label = xstrfmt("%s... %s", abbrev, out->subject);
 198        out->parent_label = xstrfmt("parent of %s", out->label);
 199
 200        return 0;
 201}
 202
 203static void free_message(struct commit *commit, struct commit_message *msg)
 204{
 205        free(msg->parent_label);
 206        free(msg->label);
 207        free(msg->subject);
 208        unuse_commit_buffer(commit, msg->message);
 209}
 210
 211static void print_advice(int show_hint, struct replay_opts *opts)
 212{
 213        char *msg = getenv("GIT_CHERRY_PICK_HELP");
 214
 215        if (msg) {
 216                fprintf(stderr, "%s\n", msg);
 217                /*
 218                 * A conflict has occurred but the porcelain
 219                 * (typically rebase --interactive) wants to take care
 220                 * of the commit itself so remove CHERRY_PICK_HEAD
 221                 */
 222                unlink(git_path_cherry_pick_head());
 223                return;
 224        }
 225
 226        if (show_hint) {
 227                if (opts->no_commit)
 228                        advise(_("after resolving the conflicts, mark the corrected paths\n"
 229                                 "with 'git add <paths>' or 'git rm <paths>'"));
 230                else
 231                        advise(_("after resolving the conflicts, mark the corrected paths\n"
 232                                 "with 'git add <paths>' or 'git rm <paths>'\n"
 233                                 "and commit the result with 'git commit'"));
 234        }
 235}
 236
 237static int write_message(const void *buf, size_t len, const char *filename,
 238                         int append_eol)
 239{
 240        static struct lock_file msg_file;
 241
 242        int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
 243        if (msg_fd < 0)
 244                return error_errno(_("Could not lock '%s'"), filename);
 245        if (write_in_full(msg_fd, buf, len) < 0) {
 246                rollback_lock_file(&msg_file);
 247                return error_errno(_("Could not write to '%s'"), filename);
 248        }
 249        if (append_eol && write(msg_fd, "\n", 1) < 0) {
 250                rollback_lock_file(&msg_file);
 251                return error_errno(_("Could not write eol to '%s"), filename);
 252        }
 253        if (commit_lock_file(&msg_file) < 0) {
 254                rollback_lock_file(&msg_file);
 255                return error(_("Error wrapping up %s."), filename);
 256        }
 257
 258        return 0;
 259}
 260
 261/*
 262 * Reads a file that was presumably written by a shell script, i.e. with an
 263 * end-of-line marker that needs to be stripped.
 264 *
 265 * Note that only the last end-of-line marker is stripped, consistent with the
 266 * behavior of "$(cat path)" in a shell script.
 267 *
 268 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
 269 */
 270static int read_oneliner(struct strbuf *buf,
 271        const char *path, int skip_if_empty)
 272{
 273        int orig_len = buf->len;
 274
 275        if (!file_exists(path))
 276                return 0;
 277
 278        if (strbuf_read_file(buf, path, 0) < 0) {
 279                warning_errno(_("could not read '%s'"), path);
 280                return 0;
 281        }
 282
 283        if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') {
 284                if (--buf->len > orig_len && buf->buf[buf->len - 1] == '\r')
 285                        --buf->len;
 286                buf->buf[buf->len] = '\0';
 287        }
 288
 289        if (skip_if_empty && buf->len == orig_len)
 290                return 0;
 291
 292        return 1;
 293}
 294
 295static struct tree *empty_tree(void)
 296{
 297        return lookup_tree(EMPTY_TREE_SHA1_BIN);
 298}
 299
 300static int error_dirty_index(struct replay_opts *opts)
 301{
 302        if (read_cache_unmerged())
 303                return error_resolve_conflict(action_name(opts));
 304
 305        error(_("Your local changes would be overwritten by %s."),
 306                action_name(opts));
 307
 308        if (advice_commit_before_merge)
 309                advise(_("Commit your changes or stash them to proceed."));
 310        return -1;
 311}
 312
 313static int fast_forward_to(const unsigned char *to, const unsigned char *from,
 314                        int unborn, struct replay_opts *opts)
 315{
 316        struct ref_transaction *transaction;
 317        struct strbuf sb = STRBUF_INIT;
 318        struct strbuf err = STRBUF_INIT;
 319
 320        read_cache();
 321        if (checkout_fast_forward(from, to, 1))
 322                return -1; /* the callee should have complained already */
 323
 324        strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
 325
 326        transaction = ref_transaction_begin(&err);
 327        if (!transaction ||
 328            ref_transaction_update(transaction, "HEAD",
 329                                   to, unborn ? null_sha1 : from,
 330                                   0, sb.buf, &err) ||
 331            ref_transaction_commit(transaction, &err)) {
 332                ref_transaction_free(transaction);
 333                error("%s", err.buf);
 334                strbuf_release(&sb);
 335                strbuf_release(&err);
 336                return -1;
 337        }
 338
 339        strbuf_release(&sb);
 340        strbuf_release(&err);
 341        ref_transaction_free(transaction);
 342        return 0;
 343}
 344
 345void append_conflicts_hint(struct strbuf *msgbuf)
 346{
 347        int i;
 348
 349        strbuf_addch(msgbuf, '\n');
 350        strbuf_commented_addf(msgbuf, "Conflicts:\n");
 351        for (i = 0; i < active_nr;) {
 352                const struct cache_entry *ce = active_cache[i++];
 353                if (ce_stage(ce)) {
 354                        strbuf_commented_addf(msgbuf, "\t%s\n", ce->name);
 355                        while (i < active_nr && !strcmp(ce->name,
 356                                                        active_cache[i]->name))
 357                                i++;
 358                }
 359        }
 360}
 361
 362static int do_recursive_merge(struct commit *base, struct commit *next,
 363                              const char *base_label, const char *next_label,
 364                              unsigned char *head, struct strbuf *msgbuf,
 365                              struct replay_opts *opts)
 366{
 367        struct merge_options o;
 368        struct tree *result, *next_tree, *base_tree, *head_tree;
 369        int clean;
 370        char **xopt;
 371        static struct lock_file index_lock;
 372
 373        hold_locked_index(&index_lock, 1);
 374
 375        read_cache();
 376
 377        init_merge_options(&o);
 378        o.ancestor = base ? base_label : "(empty tree)";
 379        o.branch1 = "HEAD";
 380        o.branch2 = next ? next_label : "(empty tree)";
 381
 382        head_tree = parse_tree_indirect(head);
 383        next_tree = next ? next->tree : empty_tree();
 384        base_tree = base ? base->tree : empty_tree();
 385
 386        for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
 387                parse_merge_opt(&o, *xopt);
 388
 389        clean = merge_trees(&o,
 390                            head_tree,
 391                            next_tree, base_tree, &result);
 392        strbuf_release(&o.obuf);
 393        if (clean < 0)
 394                return clean;
 395
 396        if (active_cache_changed &&
 397            write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
 398                /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
 399                return error(_("%s: Unable to write new index file"),
 400                        action_name(opts));
 401        rollback_lock_file(&index_lock);
 402
 403        if (opts->signoff)
 404                append_signoff(msgbuf, 0, 0);
 405
 406        if (!clean)
 407                append_conflicts_hint(msgbuf);
 408
 409        return !clean;
 410}
 411
 412static int is_index_unchanged(void)
 413{
 414        unsigned char head_sha1[20];
 415        struct commit *head_commit;
 416
 417        if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_sha1, NULL))
 418                return error(_("Could not resolve HEAD commit\n"));
 419
 420        head_commit = lookup_commit(head_sha1);
 421
 422        /*
 423         * If head_commit is NULL, check_commit, called from
 424         * lookup_commit, would have indicated that head_commit is not
 425         * a commit object already.  parse_commit() will return failure
 426         * without further complaints in such a case.  Otherwise, if
 427         * the commit is invalid, parse_commit() will complain.  So
 428         * there is nothing for us to say here.  Just return failure.
 429         */
 430        if (parse_commit(head_commit))
 431                return -1;
 432
 433        if (!active_cache_tree)
 434                active_cache_tree = cache_tree();
 435
 436        if (!cache_tree_fully_valid(active_cache_tree))
 437                if (cache_tree_update(&the_index, 0))
 438                        return error(_("Unable to update cache tree\n"));
 439
 440        return !hashcmp(active_cache_tree->sha1, head_commit->tree->object.oid.hash);
 441}
 442
 443/*
 444 * Read the author-script file into an environment block, ready for use in
 445 * run_command(), that can be free()d afterwards.
 446 */
 447static char **read_author_script(void)
 448{
 449        struct strbuf script = STRBUF_INIT;
 450        int i, count = 0;
 451        char *p, *p2, **env;
 452        size_t env_size;
 453
 454        if (strbuf_read_file(&script, rebase_path_author_script(), 256) <= 0)
 455                return NULL;
 456
 457        for (p = script.buf; *p; p++)
 458                if (skip_prefix(p, "'\\\\''", (const char **)&p2))
 459                        strbuf_splice(&script, p - script.buf, p2 - p, "'", 1);
 460                else if (*p == '\'')
 461                        strbuf_splice(&script, p-- - script.buf, 1, "", 0);
 462                else if (*p == '\n') {
 463                        *p = '\0';
 464                        count++;
 465                }
 466
 467        env_size = (count + 1) * sizeof(*env);
 468        strbuf_grow(&script, env_size);
 469        memmove(script.buf + env_size, script.buf, script.len);
 470        p = script.buf + env_size;
 471        env = (char **)strbuf_detach(&script, NULL);
 472
 473        for (i = 0; i < count; i++) {
 474                env[i] = p;
 475                p += strlen(p) + 1;
 476        }
 477        env[count] = NULL;
 478
 479        return env;
 480}
 481
 482/*
 483 * If we are cherry-pick, and if the merge did not result in
 484 * hand-editing, we will hit this commit and inherit the original
 485 * author date and name.
 486 *
 487 * If we are revert, or if our cherry-pick results in a hand merge,
 488 * we had better say that the current user is responsible for that.
 489 *
 490 * An exception is when run_git_commit() is called during an
 491 * interactive rebase: in that case, we will want to retain the
 492 * author metadata.
 493 */
 494static int run_git_commit(const char *defmsg, struct replay_opts *opts,
 495                          int allow_empty, int edit, int amend,
 496                          int cleanup_commit_message)
 497{
 498        char **env = NULL;
 499        struct argv_array array;
 500        int rc;
 501        const char *value;
 502
 503        if (is_rebase_i(opts)) {
 504                env = read_author_script();
 505                if (!env) {
 506                        const char *gpg_opt = gpg_sign_opt_quoted(opts);
 507
 508                        return error("You have staged changes in your working "
 509                                "tree. If these changes are meant to be\n"
 510                                "squashed into the previous commit, run:\n\n"
 511                                "  git commit --amend %s\n\n"
 512                                "If they are meant to go into a new commit, "
 513                                "run:\n\n"
 514                                "  git commit %s\n\n"
 515                                "In both cases, once you're done, continue "
 516                                "with:\n\n"
 517                                "  git rebase --continue\n", gpg_opt, gpg_opt);
 518                }
 519        }
 520
 521        argv_array_init(&array);
 522        argv_array_push(&array, "commit");
 523        argv_array_push(&array, "-n");
 524
 525        if (amend)
 526                argv_array_push(&array, "--amend");
 527        if (opts->gpg_sign)
 528                argv_array_pushf(&array, "-S%s", opts->gpg_sign);
 529        if (opts->signoff)
 530                argv_array_push(&array, "-s");
 531        if (defmsg)
 532                argv_array_pushl(&array, "-F", defmsg, NULL);
 533        if (cleanup_commit_message)
 534                argv_array_push(&array, "--cleanup=strip");
 535        if (edit)
 536                argv_array_push(&array, "-e");
 537        else if (!cleanup_commit_message &&
 538                 !opts->signoff && !opts->record_origin &&
 539                 git_config_get_value("commit.cleanup", &value))
 540                argv_array_push(&array, "--cleanup=verbatim");
 541
 542        if (allow_empty)
 543                argv_array_push(&array, "--allow-empty");
 544
 545        if (opts->allow_empty_message)
 546                argv_array_push(&array, "--allow-empty-message");
 547
 548        rc = run_command_v_opt_cd_env(array.argv, RUN_GIT_CMD, NULL,
 549                        (const char *const *)env);
 550        argv_array_clear(&array);
 551        free(env);
 552
 553        return rc;
 554}
 555
 556static int is_original_commit_empty(struct commit *commit)
 557{
 558        const unsigned char *ptree_sha1;
 559
 560        if (parse_commit(commit))
 561                return error(_("Could not parse commit %s\n"),
 562                             oid_to_hex(&commit->object.oid));
 563        if (commit->parents) {
 564                struct commit *parent = commit->parents->item;
 565                if (parse_commit(parent))
 566                        return error(_("Could not parse parent commit %s\n"),
 567                                oid_to_hex(&parent->object.oid));
 568                ptree_sha1 = parent->tree->object.oid.hash;
 569        } else {
 570                ptree_sha1 = EMPTY_TREE_SHA1_BIN; /* commit is root */
 571        }
 572
 573        return !hashcmp(ptree_sha1, commit->tree->object.oid.hash);
 574}
 575
 576/*
 577 * Do we run "git commit" with "--allow-empty"?
 578 */
 579static int allow_empty(struct replay_opts *opts, struct commit *commit)
 580{
 581        int index_unchanged, empty_commit;
 582
 583        /*
 584         * Three cases:
 585         *
 586         * (1) we do not allow empty at all and error out.
 587         *
 588         * (2) we allow ones that were initially empty, but
 589         * forbid the ones that become empty;
 590         *
 591         * (3) we allow both.
 592         */
 593        if (!opts->allow_empty)
 594                return 0; /* let "git commit" barf as necessary */
 595
 596        index_unchanged = is_index_unchanged();
 597        if (index_unchanged < 0)
 598                return index_unchanged;
 599        if (!index_unchanged)
 600                return 0; /* we do not have to say --allow-empty */
 601
 602        if (opts->keep_redundant_commits)
 603                return 1;
 604
 605        empty_commit = is_original_commit_empty(commit);
 606        if (empty_commit < 0)
 607                return empty_commit;
 608        if (!empty_commit)
 609                return 0;
 610        else
 611                return 1;
 612}
 613
 614enum todo_command {
 615        TODO_PICK = 0,
 616        TODO_REVERT
 617};
 618
 619static const char *todo_command_strings[] = {
 620        "pick",
 621        "revert"
 622};
 623
 624static const char *command_to_string(const enum todo_command command)
 625{
 626        if (command < ARRAY_SIZE(todo_command_strings))
 627                return todo_command_strings[command];
 628        die("Unknown command: %d", command);
 629}
 630
 631
 632static int do_pick_commit(enum todo_command command, struct commit *commit,
 633                struct replay_opts *opts)
 634{
 635        unsigned char head[20];
 636        struct commit *base, *next, *parent;
 637        const char *base_label, *next_label;
 638        struct commit_message msg = { NULL, NULL, NULL, NULL };
 639        struct strbuf msgbuf = STRBUF_INIT;
 640        int res, unborn = 0, allow;
 641
 642        if (opts->no_commit) {
 643                /*
 644                 * We do not intend to commit immediately.  We just want to
 645                 * merge the differences in, so let's compute the tree
 646                 * that represents the "current" state for merge-recursive
 647                 * to work on.
 648                 */
 649                if (write_cache_as_tree(head, 0, NULL))
 650                        return error(_("Your index file is unmerged."));
 651        } else {
 652                unborn = get_sha1("HEAD", head);
 653                if (unborn)
 654                        hashcpy(head, EMPTY_TREE_SHA1_BIN);
 655                if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0))
 656                        return error_dirty_index(opts);
 657        }
 658        discard_cache();
 659
 660        if (!commit->parents) {
 661                parent = NULL;
 662        }
 663        else if (commit->parents->next) {
 664                /* Reverting or cherry-picking a merge commit */
 665                int cnt;
 666                struct commit_list *p;
 667
 668                if (!opts->mainline)
 669                        return error(_("Commit %s is a merge but no -m option was given."),
 670                                oid_to_hex(&commit->object.oid));
 671
 672                for (cnt = 1, p = commit->parents;
 673                     cnt != opts->mainline && p;
 674                     cnt++)
 675                        p = p->next;
 676                if (cnt != opts->mainline || !p)
 677                        return error(_("Commit %s does not have parent %d"),
 678                                oid_to_hex(&commit->object.oid), opts->mainline);
 679                parent = p->item;
 680        } else if (0 < opts->mainline)
 681                return error(_("Mainline was specified but commit %s is not a merge."),
 682                        oid_to_hex(&commit->object.oid));
 683        else
 684                parent = commit->parents->item;
 685
 686        if (opts->allow_ff &&
 687            ((parent && !hashcmp(parent->object.oid.hash, head)) ||
 688             (!parent && unborn)))
 689                return fast_forward_to(commit->object.oid.hash, head, unborn, opts);
 690
 691        if (parent && parse_commit(parent) < 0)
 692                /* TRANSLATORS: The first %s will be a "todo" command like
 693                   "revert" or "pick", the second %s a SHA1. */
 694                return error(_("%s: cannot parse parent commit %s"),
 695                        command_to_string(command),
 696                        oid_to_hex(&parent->object.oid));
 697
 698        if (get_message(commit, &msg) != 0)
 699                return error(_("Cannot get commit message for %s"),
 700                        oid_to_hex(&commit->object.oid));
 701
 702        /*
 703         * "commit" is an existing commit.  We would want to apply
 704         * the difference it introduces since its first parent "prev"
 705         * on top of the current HEAD if we are cherry-pick.  Or the
 706         * reverse of it if we are revert.
 707         */
 708
 709        if (command == TODO_REVERT) {
 710                base = commit;
 711                base_label = msg.label;
 712                next = parent;
 713                next_label = msg.parent_label;
 714                strbuf_addstr(&msgbuf, "Revert \"");
 715                strbuf_addstr(&msgbuf, msg.subject);
 716                strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit ");
 717                strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
 718
 719                if (commit->parents && commit->parents->next) {
 720                        strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
 721                        strbuf_addstr(&msgbuf, oid_to_hex(&parent->object.oid));
 722                }
 723                strbuf_addstr(&msgbuf, ".\n");
 724        } else {
 725                const char *p;
 726
 727                base = parent;
 728                base_label = msg.parent_label;
 729                next = commit;
 730                next_label = msg.label;
 731
 732                /*
 733                 * Append the commit log message to msgbuf; it starts
 734                 * after the tree, parent, author, committer
 735                 * information followed by "\n\n".
 736                 */
 737                p = strstr(msg.message, "\n\n");
 738                if (p)
 739                        strbuf_addstr(&msgbuf, skip_blank_lines(p + 2));
 740
 741                if (opts->record_origin) {
 742                        if (!has_conforming_footer(&msgbuf, NULL, 0))
 743                                strbuf_addch(&msgbuf, '\n');
 744                        strbuf_addstr(&msgbuf, cherry_picked_prefix);
 745                        strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
 746                        strbuf_addstr(&msgbuf, ")\n");
 747                }
 748        }
 749
 750        if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
 751                res = do_recursive_merge(base, next, base_label, next_label,
 752                                         head, &msgbuf, opts);
 753                if (res < 0)
 754                        return res;
 755                res |= write_message(msgbuf.buf, msgbuf.len,
 756                                     git_path_merge_msg(), 0);
 757        } else {
 758                struct commit_list *common = NULL;
 759                struct commit_list *remotes = NULL;
 760
 761                res = write_message(msgbuf.buf, msgbuf.len,
 762                                    git_path_merge_msg(), 0);
 763
 764                commit_list_insert(base, &common);
 765                commit_list_insert(next, &remotes);
 766                res |= try_merge_command(opts->strategy,
 767                                         opts->xopts_nr, (const char **)opts->xopts,
 768                                        common, sha1_to_hex(head), remotes);
 769                free_commit_list(common);
 770                free_commit_list(remotes);
 771        }
 772        strbuf_release(&msgbuf);
 773
 774        /*
 775         * If the merge was clean or if it failed due to conflict, we write
 776         * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
 777         * However, if the merge did not even start, then we don't want to
 778         * write it at all.
 779         */
 780        if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) &&
 781            update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.oid.hash, NULL,
 782                       REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
 783                res = -1;
 784        if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) &&
 785            update_ref(NULL, "REVERT_HEAD", commit->object.oid.hash, NULL,
 786                       REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
 787                res = -1;
 788
 789        if (res) {
 790                error(command == TODO_REVERT
 791                      ? _("could not revert %s... %s")
 792                      : _("could not apply %s... %s"),
 793                      short_commit_name(commit), msg.subject);
 794                print_advice(res == 1, opts);
 795                rerere(opts->allow_rerere_auto);
 796                goto leave;
 797        }
 798
 799        allow = allow_empty(opts, commit);
 800        if (allow < 0) {
 801                res = allow;
 802                goto leave;
 803        }
 804        if (!opts->no_commit)
 805                res = run_git_commit(opts->edit ? NULL : git_path_merge_msg(),
 806                                     opts, allow, opts->edit, 0, 0);
 807
 808leave:
 809        free_message(commit, &msg);
 810
 811        return res;
 812}
 813
 814static int prepare_revs(struct replay_opts *opts)
 815{
 816        /*
 817         * picking (but not reverting) ranges (but not individual revisions)
 818         * should be done in reverse
 819         */
 820        if (opts->action == REPLAY_PICK && !opts->revs->no_walk)
 821                opts->revs->reverse ^= 1;
 822
 823        if (prepare_revision_walk(opts->revs))
 824                return error(_("revision walk setup failed"));
 825
 826        if (!opts->revs->commits)
 827                return error(_("empty commit set passed"));
 828        return 0;
 829}
 830
 831static int read_and_refresh_cache(struct replay_opts *opts)
 832{
 833        static struct lock_file index_lock;
 834        int index_fd = hold_locked_index(&index_lock, 0);
 835        if (read_index_preload(&the_index, NULL) < 0) {
 836                rollback_lock_file(&index_lock);
 837                return error(_("git %s: failed to read the index"),
 838                        action_name(opts));
 839        }
 840        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
 841        if (the_index.cache_changed && index_fd >= 0) {
 842                if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) {
 843                        rollback_lock_file(&index_lock);
 844                        return error(_("git %s: failed to refresh the index"),
 845                                action_name(opts));
 846                }
 847        }
 848        rollback_lock_file(&index_lock);
 849        return 0;
 850}
 851
 852struct todo_item {
 853        enum todo_command command;
 854        struct commit *commit;
 855        const char *arg;
 856        int arg_len;
 857        size_t offset_in_buf;
 858};
 859
 860struct todo_list {
 861        struct strbuf buf;
 862        struct todo_item *items;
 863        int nr, alloc, current;
 864};
 865
 866#define TODO_LIST_INIT { STRBUF_INIT }
 867
 868static void todo_list_release(struct todo_list *todo_list)
 869{
 870        strbuf_release(&todo_list->buf);
 871        free(todo_list->items);
 872        todo_list->items = NULL;
 873        todo_list->nr = todo_list->alloc = 0;
 874}
 875
 876static struct todo_item *append_new_todo(struct todo_list *todo_list)
 877{
 878        ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc);
 879        return todo_list->items + todo_list->nr++;
 880}
 881
 882static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
 883{
 884        unsigned char commit_sha1[20];
 885        char *end_of_object_name;
 886        int i, saved, status, padding;
 887
 888        /* left-trim */
 889        bol += strspn(bol, " \t");
 890
 891        for (i = 0; i < ARRAY_SIZE(todo_command_strings); i++)
 892                if (skip_prefix(bol, todo_command_strings[i], &bol)) {
 893                        item->command = i;
 894                        break;
 895                }
 896        if (i >= ARRAY_SIZE(todo_command_strings))
 897                return -1;
 898
 899        /* Eat up extra spaces/ tabs before object name */
 900        padding = strspn(bol, " \t");
 901        if (!padding)
 902                return -1;
 903        bol += padding;
 904
 905        end_of_object_name = (char *) bol + strcspn(bol, " \t\n");
 906        saved = *end_of_object_name;
 907        *end_of_object_name = '\0';
 908        status = get_sha1(bol, commit_sha1);
 909        *end_of_object_name = saved;
 910
 911        item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
 912        item->arg_len = (int)(eol - item->arg);
 913
 914        if (status < 0)
 915                return -1;
 916
 917        item->commit = lookup_commit_reference(commit_sha1);
 918        return !item->commit;
 919}
 920
 921static int parse_insn_buffer(char *buf, struct todo_list *todo_list)
 922{
 923        struct todo_item *item;
 924        char *p = buf, *next_p;
 925        int i, res = 0;
 926
 927        for (i = 1; *p; i++, p = next_p) {
 928                char *eol = strchrnul(p, '\n');
 929
 930                next_p = *eol ? eol + 1 /* skip LF */ : eol;
 931
 932                if (p != eol && eol[-1] == '\r')
 933                        eol--; /* strip Carriage Return */
 934
 935                item = append_new_todo(todo_list);
 936                item->offset_in_buf = p - todo_list->buf.buf;
 937                if (parse_insn_line(item, p, eol)) {
 938                        res = error(_("Invalid line %d: %.*s"),
 939                                i, (int)(eol - p), p);
 940                        item->command = -1;
 941                }
 942        }
 943        if (!todo_list->nr)
 944                return error(_("No commits parsed."));
 945        return res;
 946}
 947
 948static int read_populate_todo(struct todo_list *todo_list,
 949                        struct replay_opts *opts)
 950{
 951        const char *todo_file = get_todo_path(opts);
 952        int fd, res;
 953
 954        strbuf_reset(&todo_list->buf);
 955        fd = open(todo_file, O_RDONLY);
 956        if (fd < 0)
 957                return error_errno(_("Could not open %s"), todo_file);
 958        if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
 959                close(fd);
 960                return error(_("Could not read %s."), todo_file);
 961        }
 962        close(fd);
 963
 964        res = parse_insn_buffer(todo_list->buf.buf, todo_list);
 965        if (!res) {
 966                enum todo_command valid =
 967                        opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT;
 968                int i;
 969
 970                for (i = 0; i < todo_list->nr; i++)
 971                        if (valid == todo_list->items[i].command)
 972                                continue;
 973                        else if (valid == TODO_PICK)
 974                                return error(_("Cannot cherry-pick during a revert."));
 975                        else
 976                                return error(_("Cannot revert during a cherry-pick."));
 977        }
 978
 979        if (res)
 980                return error(_("Unusable instruction sheet: %s"), todo_file);
 981        return 0;
 982}
 983
 984static int git_config_string_dup(char **dest,
 985                                 const char *var, const char *value)
 986{
 987        if (!value)
 988                return config_error_nonbool(var);
 989        free(*dest);
 990        *dest = xstrdup(value);
 991        return 0;
 992}
 993
 994static int populate_opts_cb(const char *key, const char *value, void *data)
 995{
 996        struct replay_opts *opts = data;
 997        int error_flag = 1;
 998
 999        if (!value)
1000                error_flag = 0;
1001        else if (!strcmp(key, "options.no-commit"))
1002                opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
1003        else if (!strcmp(key, "options.edit"))
1004                opts->edit = git_config_bool_or_int(key, value, &error_flag);
1005        else if (!strcmp(key, "options.signoff"))
1006                opts->signoff = git_config_bool_or_int(key, value, &error_flag);
1007        else if (!strcmp(key, "options.record-origin"))
1008                opts->record_origin = git_config_bool_or_int(key, value, &error_flag);
1009        else if (!strcmp(key, "options.allow-ff"))
1010                opts->allow_ff = git_config_bool_or_int(key, value, &error_flag);
1011        else if (!strcmp(key, "options.mainline"))
1012                opts->mainline = git_config_int(key, value);
1013        else if (!strcmp(key, "options.strategy"))
1014                git_config_string_dup(&opts->strategy, key, value);
1015        else if (!strcmp(key, "options.gpg-sign"))
1016                git_config_string_dup(&opts->gpg_sign, key, value);
1017        else if (!strcmp(key, "options.strategy-option")) {
1018                ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
1019                opts->xopts[opts->xopts_nr++] = xstrdup(value);
1020        } else
1021                return error(_("Invalid key: %s"), key);
1022
1023        if (!error_flag)
1024                return error(_("Invalid value for %s: %s"), key, value);
1025
1026        return 0;
1027}
1028
1029static int read_populate_opts(struct replay_opts *opts)
1030{
1031        if (is_rebase_i(opts)) {
1032                struct strbuf buf = STRBUF_INIT;
1033
1034                if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), 1)) {
1035                        if (!starts_with(buf.buf, "-S"))
1036                                strbuf_reset(&buf);
1037                        else {
1038                                free(opts->gpg_sign);
1039                                opts->gpg_sign = xstrdup(buf.buf + 2);
1040                        }
1041                }
1042                strbuf_release(&buf);
1043
1044                return 0;
1045        }
1046
1047        if (!file_exists(git_path_opts_file()))
1048                return 0;
1049        /*
1050         * The function git_parse_source(), called from git_config_from_file(),
1051         * may die() in case of a syntactically incorrect file. We do not care
1052         * about this case, though, because we wrote that file ourselves, so we
1053         * are pretty certain that it is syntactically correct.
1054         */
1055        if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
1056                return error(_("Malformed options sheet: %s"),
1057                        git_path_opts_file());
1058        return 0;
1059}
1060
1061static int walk_revs_populate_todo(struct todo_list *todo_list,
1062                                struct replay_opts *opts)
1063{
1064        enum todo_command command = opts->action == REPLAY_PICK ?
1065                TODO_PICK : TODO_REVERT;
1066        const char *command_string = todo_command_strings[command];
1067        struct commit *commit;
1068
1069        if (prepare_revs(opts))
1070                return -1;
1071
1072        while ((commit = get_revision(opts->revs))) {
1073                struct todo_item *item = append_new_todo(todo_list);
1074                const char *commit_buffer = get_commit_buffer(commit, NULL);
1075                const char *subject;
1076                int subject_len;
1077
1078                item->command = command;
1079                item->commit = commit;
1080                item->arg = NULL;
1081                item->arg_len = 0;
1082                item->offset_in_buf = todo_list->buf.len;
1083                subject_len = find_commit_subject(commit_buffer, &subject);
1084                strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string,
1085                        short_commit_name(commit), subject_len, subject);
1086                unuse_commit_buffer(commit, commit_buffer);
1087        }
1088        return 0;
1089}
1090
1091static int create_seq_dir(void)
1092{
1093        if (file_exists(git_path_seq_dir())) {
1094                error(_("a cherry-pick or revert is already in progress"));
1095                advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1096                return -1;
1097        }
1098        else if (mkdir(git_path_seq_dir(), 0777) < 0)
1099                return error_errno(_("Could not create sequencer directory %s"),
1100                                   git_path_seq_dir());
1101        return 0;
1102}
1103
1104static int save_head(const char *head)
1105{
1106        static struct lock_file head_lock;
1107        struct strbuf buf = STRBUF_INIT;
1108        int fd;
1109
1110        fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0);
1111        if (fd < 0) {
1112                rollback_lock_file(&head_lock);
1113                return error_errno(_("Could not lock HEAD"));
1114        }
1115        strbuf_addf(&buf, "%s\n", head);
1116        if (write_in_full(fd, buf.buf, buf.len) < 0) {
1117                rollback_lock_file(&head_lock);
1118                return error_errno(_("Could not write to %s"),
1119                                   git_path_head_file());
1120        }
1121        if (commit_lock_file(&head_lock) < 0) {
1122                rollback_lock_file(&head_lock);
1123                return error(_("Error wrapping up %s."), git_path_head_file());
1124        }
1125        return 0;
1126}
1127
1128static int reset_for_rollback(const unsigned char *sha1)
1129{
1130        const char *argv[4];    /* reset --merge <arg> + NULL */
1131        argv[0] = "reset";
1132        argv[1] = "--merge";
1133        argv[2] = sha1_to_hex(sha1);
1134        argv[3] = NULL;
1135        return run_command_v_opt(argv, RUN_GIT_CMD);
1136}
1137
1138static int rollback_single_pick(void)
1139{
1140        unsigned char head_sha1[20];
1141
1142        if (!file_exists(git_path_cherry_pick_head()) &&
1143            !file_exists(git_path_revert_head()))
1144                return error(_("no cherry-pick or revert in progress"));
1145        if (read_ref_full("HEAD", 0, head_sha1, NULL))
1146                return error(_("cannot resolve HEAD"));
1147        if (is_null_sha1(head_sha1))
1148                return error(_("cannot abort from a branch yet to be born"));
1149        return reset_for_rollback(head_sha1);
1150}
1151
1152int sequencer_rollback(struct replay_opts *opts)
1153{
1154        FILE *f;
1155        unsigned char sha1[20];
1156        struct strbuf buf = STRBUF_INIT;
1157
1158        f = fopen(git_path_head_file(), "r");
1159        if (!f && errno == ENOENT) {
1160                /*
1161                 * There is no multiple-cherry-pick in progress.
1162                 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1163                 * a single-cherry-pick in progress, abort that.
1164                 */
1165                return rollback_single_pick();
1166        }
1167        if (!f)
1168                return error_errno(_("cannot open %s"), git_path_head_file());
1169        if (strbuf_getline_lf(&buf, f)) {
1170                error(_("cannot read %s: %s"), git_path_head_file(),
1171                      ferror(f) ?  strerror(errno) : _("unexpected end of file"));
1172                fclose(f);
1173                goto fail;
1174        }
1175        fclose(f);
1176        if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
1177                error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1178                        git_path_head_file());
1179                goto fail;
1180        }
1181        if (is_null_sha1(sha1)) {
1182                error(_("cannot abort from a branch yet to be born"));
1183                goto fail;
1184        }
1185        if (reset_for_rollback(sha1))
1186                goto fail;
1187        strbuf_release(&buf);
1188        return sequencer_remove_state(opts);
1189fail:
1190        strbuf_release(&buf);
1191        return -1;
1192}
1193
1194static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
1195{
1196        static struct lock_file todo_lock;
1197        const char *todo_path = get_todo_path(opts);
1198        int next = todo_list->current, offset, fd;
1199
1200        fd = hold_lock_file_for_update(&todo_lock, todo_path, 0);
1201        if (fd < 0)
1202                return error_errno(_("Could not lock '%s'"), todo_path);
1203        offset = next < todo_list->nr ?
1204                todo_list->items[next].offset_in_buf : todo_list->buf.len;
1205        if (write_in_full(fd, todo_list->buf.buf + offset,
1206                        todo_list->buf.len - offset) < 0)
1207                return error_errno(_("Could not write to '%s'"), todo_path);
1208        if (commit_lock_file(&todo_lock) < 0)
1209                return error(_("Error wrapping up %s."), todo_path);
1210        return 0;
1211}
1212
1213static int save_opts(struct replay_opts *opts)
1214{
1215        const char *opts_file = git_path_opts_file();
1216        int res = 0;
1217
1218        if (opts->no_commit)
1219                res |= git_config_set_in_file_gently(opts_file, "options.no-commit", "true");
1220        if (opts->edit)
1221                res |= git_config_set_in_file_gently(opts_file, "options.edit", "true");
1222        if (opts->signoff)
1223                res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true");
1224        if (opts->record_origin)
1225                res |= git_config_set_in_file_gently(opts_file, "options.record-origin", "true");
1226        if (opts->allow_ff)
1227                res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true");
1228        if (opts->mainline) {
1229                struct strbuf buf = STRBUF_INIT;
1230                strbuf_addf(&buf, "%d", opts->mainline);
1231                res |= git_config_set_in_file_gently(opts_file, "options.mainline", buf.buf);
1232                strbuf_release(&buf);
1233        }
1234        if (opts->strategy)
1235                res |= git_config_set_in_file_gently(opts_file, "options.strategy", opts->strategy);
1236        if (opts->gpg_sign)
1237                res |= git_config_set_in_file_gently(opts_file, "options.gpg-sign", opts->gpg_sign);
1238        if (opts->xopts) {
1239                int i;
1240                for (i = 0; i < opts->xopts_nr; i++)
1241                        res |= git_config_set_multivar_in_file_gently(opts_file,
1242                                                        "options.strategy-option",
1243                                                        opts->xopts[i], "^$", 0);
1244        }
1245        return res;
1246}
1247
1248static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
1249{
1250        int res;
1251
1252        setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
1253        if (opts->allow_ff)
1254                assert(!(opts->signoff || opts->no_commit ||
1255                                opts->record_origin || opts->edit));
1256        if (read_and_refresh_cache(opts))
1257                return -1;
1258
1259        while (todo_list->current < todo_list->nr) {
1260                struct todo_item *item = todo_list->items + todo_list->current;
1261                if (save_todo(todo_list, opts))
1262                        return -1;
1263                res = do_pick_commit(item->command, item->commit, opts);
1264                todo_list->current++;
1265                if (res)
1266                        return res;
1267        }
1268
1269        /*
1270         * Sequence of picks finished successfully; cleanup by
1271         * removing the .git/sequencer directory
1272         */
1273        return sequencer_remove_state(opts);
1274}
1275
1276static int continue_single_pick(void)
1277{
1278        const char *argv[] = { "commit", NULL };
1279
1280        if (!file_exists(git_path_cherry_pick_head()) &&
1281            !file_exists(git_path_revert_head()))
1282                return error(_("no cherry-pick or revert in progress"));
1283        return run_command_v_opt(argv, RUN_GIT_CMD);
1284}
1285
1286int sequencer_continue(struct replay_opts *opts)
1287{
1288        struct todo_list todo_list = TODO_LIST_INIT;
1289        int res;
1290
1291        if (read_and_refresh_cache(opts))
1292                return -1;
1293
1294        if (!file_exists(get_todo_path(opts)))
1295                return continue_single_pick();
1296        if (read_populate_opts(opts))
1297                return -1;
1298        if ((res = read_populate_todo(&todo_list, opts)))
1299                goto release_todo_list;
1300
1301        /* Verify that the conflict has been resolved */
1302        if (file_exists(git_path_cherry_pick_head()) ||
1303            file_exists(git_path_revert_head())) {
1304                res = continue_single_pick();
1305                if (res)
1306                        goto release_todo_list;
1307        }
1308        if (index_differs_from("HEAD", 0)) {
1309                res = error_dirty_index(opts);
1310                goto release_todo_list;
1311        }
1312        todo_list.current++;
1313        res = pick_commits(&todo_list, opts);
1314release_todo_list:
1315        todo_list_release(&todo_list);
1316        return res;
1317}
1318
1319static int single_pick(struct commit *cmit, struct replay_opts *opts)
1320{
1321        setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
1322        return do_pick_commit(opts->action == REPLAY_PICK ?
1323                TODO_PICK : TODO_REVERT, cmit, opts);
1324}
1325
1326int sequencer_pick_revisions(struct replay_opts *opts)
1327{
1328        struct todo_list todo_list = TODO_LIST_INIT;
1329        unsigned char sha1[20];
1330        int i, res;
1331
1332        assert(opts->revs);
1333        if (read_and_refresh_cache(opts))
1334                return -1;
1335
1336        for (i = 0; i < opts->revs->pending.nr; i++) {
1337                unsigned char sha1[20];
1338                const char *name = opts->revs->pending.objects[i].name;
1339
1340                /* This happens when using --stdin. */
1341                if (!strlen(name))
1342                        continue;
1343
1344                if (!get_sha1(name, sha1)) {
1345                        if (!lookup_commit_reference_gently(sha1, 1)) {
1346                                enum object_type type = sha1_object_info(sha1, NULL);
1347                                return error(_("%s: can't cherry-pick a %s"),
1348                                        name, typename(type));
1349                        }
1350                } else
1351                        return error(_("%s: bad revision"), name);
1352        }
1353
1354        /*
1355         * If we were called as "git cherry-pick <commit>", just
1356         * cherry-pick/revert it, set CHERRY_PICK_HEAD /
1357         * REVERT_HEAD, and don't touch the sequencer state.
1358         * This means it is possible to cherry-pick in the middle
1359         * of a cherry-pick sequence.
1360         */
1361        if (opts->revs->cmdline.nr == 1 &&
1362            opts->revs->cmdline.rev->whence == REV_CMD_REV &&
1363            opts->revs->no_walk &&
1364            !opts->revs->cmdline.rev->flags) {
1365                struct commit *cmit;
1366                if (prepare_revision_walk(opts->revs))
1367                        return error(_("revision walk setup failed"));
1368                cmit = get_revision(opts->revs);
1369                if (!cmit || get_revision(opts->revs))
1370                        return error("BUG: expected exactly one commit from walk");
1371                return single_pick(cmit, opts);
1372        }
1373
1374        /*
1375         * Start a new cherry-pick/ revert sequence; but
1376         * first, make sure that an existing one isn't in
1377         * progress
1378         */
1379
1380        if (walk_revs_populate_todo(&todo_list, opts) ||
1381                        create_seq_dir() < 0)
1382                return -1;
1383        if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT))
1384                return error(_("Can't revert as initial commit"));
1385        if (save_head(sha1_to_hex(sha1)))
1386                return -1;
1387        if (save_opts(opts))
1388                return -1;
1389        res = pick_commits(&todo_list, opts);
1390        todo_list_release(&todo_list);
1391        return res;
1392}
1393
1394void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
1395{
1396        unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
1397        struct strbuf sob = STRBUF_INIT;
1398        int has_footer;
1399
1400        strbuf_addstr(&sob, sign_off_header);
1401        strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
1402                                getenv("GIT_COMMITTER_EMAIL")));
1403        strbuf_addch(&sob, '\n');
1404
1405        /*
1406         * If the whole message buffer is equal to the sob, pretend that we
1407         * found a conforming footer with a matching sob
1408         */
1409        if (msgbuf->len - ignore_footer == sob.len &&
1410            !strncmp(msgbuf->buf, sob.buf, sob.len))
1411                has_footer = 3;
1412        else
1413                has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);
1414
1415        if (!has_footer) {
1416                const char *append_newlines = NULL;
1417                size_t len = msgbuf->len - ignore_footer;
1418
1419                if (!len) {
1420                        /*
1421                         * The buffer is completely empty.  Leave foom for
1422                         * the title and body to be filled in by the user.
1423                         */
1424                        append_newlines = "\n\n";
1425                } else if (msgbuf->buf[len - 1] != '\n') {
1426                        /*
1427                         * Incomplete line.  Complete the line and add a
1428                         * blank one so that there is an empty line between
1429                         * the message body and the sob.
1430                         */
1431                        append_newlines = "\n\n";
1432                } else if (len == 1) {
1433                        /*
1434                         * Buffer contains a single newline.  Add another
1435                         * so that we leave room for the title and body.
1436                         */
1437                        append_newlines = "\n";
1438                } else if (msgbuf->buf[len - 2] != '\n') {
1439                        /*
1440                         * Buffer ends with a single newline.  Add another
1441                         * so that there is an empty line between the message
1442                         * body and the sob.
1443                         */
1444                        append_newlines = "\n";
1445                } /* else, the buffer already ends with two newlines. */
1446
1447                if (append_newlines)
1448                        strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
1449                                append_newlines, strlen(append_newlines));
1450        }
1451
1452        if (has_footer != 3 && (!no_dup_sob || has_footer != 2))
1453                strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
1454                                sob.buf, sob.len);
1455
1456        strbuf_release(&sob);
1457}