|
|
|
@ -21,10 +21,11 @@
@@ -21,10 +21,11 @@
|
|
|
|
|
const char sign_off_header[] = "Signed-off-by: "; |
|
|
|
|
static const char cherry_picked_prefix[] = "(cherry picked from commit "; |
|
|
|
|
|
|
|
|
|
static GIT_PATH_FUNC(git_path_todo_file, SEQ_TODO_FILE) |
|
|
|
|
static GIT_PATH_FUNC(git_path_opts_file, SEQ_OPTS_FILE) |
|
|
|
|
static GIT_PATH_FUNC(git_path_seq_dir, SEQ_DIR) |
|
|
|
|
static GIT_PATH_FUNC(git_path_head_file, SEQ_HEAD_FILE) |
|
|
|
|
GIT_PATH_FUNC(git_path_seq_dir, "sequencer") |
|
|
|
|
|
|
|
|
|
static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo") |
|
|
|
|
static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts") |
|
|
|
|
static GIT_PATH_FUNC(git_path_head_file, "sequencer/head") |
|
|
|
|
|
|
|
|
|
static int is_rfc2822_line(const char *buf, int len) |
|
|
|
|
{ |
|
|
|
@ -112,7 +113,7 @@ static void remove_sequencer_state(void)
@@ -112,7 +113,7 @@ static void remove_sequencer_state(void)
|
|
|
|
|
{ |
|
|
|
|
struct strbuf seq_dir = STRBUF_INIT; |
|
|
|
|
|
|
|
|
|
strbuf_addstr(&seq_dir, git_path(SEQ_DIR)); |
|
|
|
|
strbuf_addstr(&seq_dir, git_path_seq_dir()); |
|
|
|
|
remove_dir_recursively(&seq_dir, 0); |
|
|
|
|
strbuf_release(&seq_dir); |
|
|
|
|
} |
|
|
|
|