mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin rebase: support --committer-date-is-author-date

Browse Source 
This option is simply handed down to `git am` by way of setting the
`git_am_opt` variable that is handled by the `git-rebase--am` backend.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pratik Karki
2018-09-04 14:59:53 -07:00
committed by Junio C Hamano
parent ead98c111b
commit 38dbcef26e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/rebase.c
View File

@ -526,6 +526,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
ACTION_EDIT_TODO, ACTION_EDIT_TODO,
ACTION_SHOW_CURRENT_PATCH, ACTION_SHOW_CURRENT_PATCH,
} action = NO_ACTION; } action = NO_ACTION;
int committer_date_is_author_date = 0;
struct option builtin_rebase_options[] = { struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name, OPT_STRING(0, "onto", &options.onto_name,
N_("revision"), N_("revision"),
@ -543,6 +544,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT }, PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
OPT_BOOL(0, "signoff", &options.signoff, OPT_BOOL(0, "signoff", &options.signoff,
N_("add a Signed-off-by: line to each commit")), N_("add a Signed-off-by: line to each commit")),
OPT_BOOL(0, "committer-date-is-author-date",
&committer_date_is_author_date,
N_("passed to 'git am'")),
OPT_BIT('f', "force-rebase", &options.flags, OPT_BIT('f', "force-rebase", &options.flags,
N_("cherry-pick all commits, even if unchanged"), N_("cherry-pick all commits, even if unchanged"),
REBASE_FORCE), REBASE_FORCE),
@ -763,6 +767,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (!(options.flags & REBASE_NO_QUIET)) if (!(options.flags & REBASE_NO_QUIET))
strbuf_addstr(&options.git_am_opt, " -q"); strbuf_addstr(&options.git_am_opt, " -q");
if (committer_date_is_author_date) {
strbuf_addstr(&options.git_am_opt,
" --committer-date-is-author-date");
options.flags |= REBASE_FORCE;
}
switch (options.type) { switch (options.type) {
case REBASE_MERGE: case REBASE_MERGE:
case REBASE_INTERACTIVE: case REBASE_INTERACTIVE: