diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-25 20:57:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-25 20:57:43 (GMT) |
| commit | f085189f145d1092b43223b72992e851fb412895 (patch) | |
| tree | d68301794c56e93d4ab61f40b8397ed8a1a7b8ef /sequencer.h | |
| parent | 9a0fa1709c188d8be05aa573fa914d115f55aab1 (diff) | |
| parent | 430b75f7209c554d88e3554eb54cebf4ba1e4608 (diff) | |
| download | git-f085189f145d1092b43223b72992e851fb412895.zip git-f085189f145d1092b43223b72992e851fb412895.tar.gz git-f085189f145d1092b43223b72992e851fb412895.tar.bz2 | |
Merge branch 'pw/advise-rebase-skip'
The mechanism to prevent "git commit" from making an empty commit
or amending during an interrupted cherry-pick was broken during the
rewrite of "git rebase" in C, which has been corrected.
* pw/advise-rebase-skip:
commit: give correct advice for empty commit during a rebase
commit: encapsulate determine_whence() for sequencer
commit: use enum value for multiple cherry-picks
sequencer: write CHERRY_PICK_HEAD for reword and edit
cherry-pick: check commit error messages
cherry-pick: add test for `--skip` advice in `git commit`
t3404: use test_cmp_rev
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 718a074..0bee850 100644 --- a/sequencer.h +++ b/sequencer.h @@ -3,12 +3,12 @@ #include "cache.h" #include "strbuf.h" +#include "wt-status.h" struct commit; struct repository; 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); @@ -206,4 +206,5 @@ int write_basic_state(struct replay_opts *opts, const char *head_name, void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); +int sequencer_determine_whence(struct repository *r, enum commit_whence *whence); #endif /* SEQUENCER_H */ |