sequencer: remember the onelines when parsing the todo file
[gitweb.git] / sequencer.c
index 9f22c5ec410e40b4725f7f90d24010096ca5cbca..3d1fdacc54731c07e791fd5d7e1f27bd753c4f38 100644 (file)
@@ -706,6 +706,8 @@ static int read_and_refresh_cache(struct replay_opts *opts)
 struct todo_item {
        enum todo_command command;
        struct commit *commit;
+       const char *arg;
+       int arg_len;
        size_t offset_in_buf;
 };
 
@@ -757,6 +759,9 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
        status = get_sha1(bol, commit_sha1);
        *end_of_object_name = saved;
 
+       item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
+       item->arg_len = (int)(eol - item->arg);
+
        if (status < 0)
                return -1;
 
@@ -907,6 +912,8 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
 
                item->command = command;
                item->commit = commit;
+               item->arg = NULL;
+               item->arg_len = 0;
                item->offset_in_buf = todo_list->buf.len;
                subject_len = find_commit_subject(commit_buffer, &subject);
                strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string,