[PATCH v5 30/44] builtin-am: implement --committer-date-is-author-date
From: Paul Tan <hidden>
Date: 2016-06-15 23:05:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since 3f01ad6 (am: Add --committer-date-is-author-date option, 2009-01-22), git-am.sh implemented the --committer-date-is-author-date option, which tells git-am to use the timestamp recorded in the email message as both author and committer date. Re-implement this option in builtin/am.c. Signed-off-by: Paul Tan <redacted> --- builtin/am.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index e9eacf0..d7bb159 100644
--- a/builtin/am.c
+++ b/builtin/am.c@@ -120,6 +120,8 @@ struct am_state { /* override error message when patch failure occurs */ const char *resolvemsg; + int committer_date_is_author_date; + int ignore_date; int rebasing;
@@ -1259,6 +1261,10 @@ static void do_commit(const struct am_state *state) state->ignore_date ? NULL : state->author_date, IDENT_STRICT); + if (state->committer_date_is_author_date) + setenv("GIT_COMMITTER_DATE", + state->ignore_date ? "" : state->author_date, 1); + if (commit_tree(state->msg, state->msg_len, tree, parents, commit, author, NULL)) die(_("failed to write commit object"));
@@ -1677,6 +1683,9 @@ int cmd_am(int argc, const char **argv, const char *prefix) OPT_CMDMODE(0, "abort", &resume, N_("restore the original branch and abort the patching operation."), RESUME_ABORT), + OPT_BOOL(0, "committer-date-is-author-date", + &state.committer_date_is_author_date, + N_("lie about committer date")), OPT_BOOL(0, "ignore-date", &state.ignore_date, N_("use current timestamp for author date")), OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
--
2.5.0.rc1.76.gf60a929