From f07adb62f292eec0d10fd10b0812800afb03363c Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Tue, 4 Aug 2015 21:51:51 +0800 Subject: [PATCH] builtin-am: implement --ignore-date Since a79ec62 (git-am: Add --ignore-date option, 2009-01-24), git-am.sh supported the --ignore-date option, and would use the current timestamp instead of the one provided in the patch if the option was set. Re-implement this option in builtin/am.c. Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- builtin/am.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c index f842f69d36..84d3e0519e 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -108,6 +108,7 @@ struct am_state { int scissors; /* enum scissors_type */ struct argv_array git_apply_opts; const char *resolvemsg; + int ignore_date; int rebasing; }; @@ -1217,7 +1218,8 @@ static void do_commit(const struct am_state *state) } author = fmt_ident(state->author_name, state->author_email, - state->author_date, IDENT_STRICT); + state->ignore_date ? NULL : state->author_date, + IDENT_STRICT); if (commit_tree(state->msg, state->msg_len, tree, parents, commit, author, NULL)) @@ -1661,6 +1663,8 @@ 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, "ignore-date", &state.ignore_date, + N_("use current timestamp for author date")), OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing, N_("(internal use for git-rebase)")), OPT_END() -- 2.11.4.GIT