diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:23 (GMT) |
| commit | 6b2a52431b238fc3c25ea931def6e5b1cf9e78fb (patch) | |
| tree | bda721edc23a6a3cd7bfb960aecc5dabfafeb7f2 /sequencer.h | |
| parent | fd4bb3806bcccbd8afa5dd45052ea37a882708ba (diff) | |
| parent | 4d010a757c40d6e6e478354991bd052ef30cb853 (diff) | |
| download | git-6b2a52431b238fc3c25ea931def6e5b1cf9e78fb.zip git-6b2a52431b238fc3c25ea931def6e5b1cf9e78fb.tar.gz git-6b2a52431b238fc3c25ea931def6e5b1cf9e78fb.tar.bz2 | |
Merge branch 'pw/am-rebase-read-author-script'
Unify code to read the author-script used in "git am" and the
commands that use the sequencer machinery, e.g. "git rebase -i".
* pw/am-rebase-read-author-script:
sequencer: use read_author_script()
add read_author_script() to libgit
am: rename read_author_script()
am: improve author-script error reporting
am: don't die in read_author_script()
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 660cff5..5071a73 100644 --- a/sequencer.h +++ b/sequencer.h @@ -130,6 +130,9 @@ int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit); #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1) void print_commit_summary(const char *prefix, const struct object_id *oid, unsigned int flags); + +int read_author_script(const char *path, char **name, char **email, char **date, + int allow_missing); #endif void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); |