kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Paul Tan 2015-08-04 21:51:51 +08:00 committed by Junio C Hamano
parent 257e8cecc1
commit f07adb62f2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/am.c
View File

@ -108,6 +108,7 @@ struct am_state {
int scissors; /* enum scissors_type */ int scissors; /* enum scissors_type */
struct argv_array git_apply_opts; struct argv_array git_apply_opts;
const char *resolvemsg; const char *resolvemsg;
int ignore_date;
int rebasing; int rebasing;
}; };


@ -1217,7 +1218,8 @@ static void do_commit(const struct am_state *state)
} }


author = fmt_ident(state->author_name, state->author_email, 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, if (commit_tree(state->msg, state->msg_len, tree, parents, commit,
author, NULL)) author, NULL))
@ -1661,6 +1663,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_CMDMODE(0, "abort", &resume, OPT_CMDMODE(0, "abort", &resume,
N_("restore the original branch and abort the patching operation."), N_("restore the original branch and abort the patching operation."),
RESUME_ABORT), RESUME_ABORT),
OPT_BOOL(0, "ignore-date", &state.ignore_date,
N_("use current timestamp for author date")),
OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing, OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
N_("(internal use for git-rebase)")), N_("(internal use for git-rebase)")),
OPT_END() OPT_END()