mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ag/edit-todo-drop-check'

Browse Source 
Allow the rebase.missingCommitsCheck configuration to kick in when
"rebase --edit-todo" and "rebase --continue" restarts the procedure.

* ag/edit-todo-drop-check:
  rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
  sequencer: move check_todo_list_from_file() to rebase-interactive.c
This commit is contained in:
Junio C Hamano
2020-02-14 12:54:21 -08:00
parent f7f43afb19 5a5445d878
commit 4dbeecba27
5 changed files with 214 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.h
View File

@ -11,6 +11,7 @@ const char *git_path_commit_editmsg(void);
const char *git_path_seq_dir(void);
const char *rebase_path_todo(void);
const char *rebase_path_todo_backup(void);
const char *rebase_path_dropped(void);
#define APPEND_SIGNOFF_DEDUP (1u << 0)
@ -155,7 +156,6 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
void todo_list_add_exec_commands(struct todo_list *todo_list,
struct string_list *commands);
int check_todo_list_from_file(struct repository *r);
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
struct commit *onto, const char *orig_head, struct string_list *commands,