From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Nov 2018 13:37:23 +0000 (+0900)
Subject: Merge branch 'pw/am-rebase-read-author-script'
X-Git-Tag: v2.20.0-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b2a52431b238fc3c25ea931def6e5b1cf9e78fb

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()
---

6b2a52431b238fc3c25ea931def6e5b1cf9e78fb
diff --cc sequencer.h
index 660cff5050,60f15a4d9c..5071a73563
--- a/sequencer.h
+++ b/sequencer.h
@@@ -130,8 -114,7 +130,11 @@@ int prepare_branch_to_be_rebased(struc
  #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);
 +int write_basic_state(struct replay_opts *opts, const char *head_name,
 +		      const char *onto, const char *orig_head);