mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 06:06:10 +02:00
Code

Merge branch 'jk/committer-date-is-author-date-fix-simplify' 

Code simplification.

* jk/committer-date-is-author-date-fix-simplify:
  am, sequencer: stop parsing our own committer ident
This commit is contained in:
Junio C Hamano 2020-11-09 14:06:27 -08:00
parent ecf95d938b 2020451c5b
commit 6a44c9c0d0
3 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/am.c
View File

@ -98,8 +98,6 @@ struct am_state {
char *author_name;
char *author_email;
char *author_date;
char *committer_name;
char *committer_email;
char *msg;
size_t msg_len;
@ -132,8 +130,6 @@ struct am_state {
*/
static void am_state_init(struct am_state *state)
{
const char *committer;
struct ident_split id;
int gpgsign;
memset(state, 0, sizeof(*state));
@ -154,14 +150,6 @@ static void am_state_init(struct am_state *state)
if (!git_config_get_bool("commit.gpgsign", &gpgsign))
state->sign_commit = gpgsign ? "" : NULL;
committer = git_committer_info(IDENT_STRICT);
if (split_ident_line(&id, committer, strlen(committer)) < 0)
die(_("invalid committer: %s"), committer);
state->committer_name =
xmemdupz(id.name_begin, id.name_end - id.name_begin);
state->committer_email =
xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
}
/**
@ -173,8 +161,6 @@ static void am_state_release(struct am_state *state)
free(state->author_name);
free(state->author_email);
free(state->author_date);
free(state->committer_name);
free(state->committer_email);
free(state->msg);
strvec_clear(&state->git_apply_opts);
}
@ -1594,8 +1580,9 @@ static void do_commit(const struct am_state *state)
IDENT_STRICT);
if (state->committer_date_is_author_date)
committer = fmt_ident(state->committer_name,
state->committer_email, WANT_COMMITTER_IDENT,
committer = fmt_ident(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL"),
WANT_COMMITTER_IDENT,
state->ignore_date ? NULL
: state->author_date,
IDENT_STRICT);

28
sequencer.c
View File

@ -314,8 +314,6 @@ int sequencer_remove_state(struct replay_opts *opts)
}
}
free(opts->committer_name);
free(opts->committer_email);
free(opts->gpg_sign);
free(opts->strategy);
for (i = 0; i < opts->xopts_nr; i++)
@ -1460,8 +1458,8 @@ static int try_to_commit(struct repository *r,
} else {
reset_ident_date();
}
committer = fmt_ident(opts->committer_name,
opts->committer_email,
committer = fmt_ident(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL"),
WANT_COMMITTER_IDENT,
opts->ignore_date ? NULL : date.buf,
IDENT_STRICT);
@ -4468,22 +4466,6 @@ static int commit_staged_changes(struct repository *r,
return 0;
}
static int init_committer(struct replay_opts *opts)
{
struct ident_split id;
const char *committer;
committer = git_committer_info(IDENT_STRICT);
if (split_ident_line(&id, committer, strlen(committer)) < 0)
return error(_("invalid committer '%s'"), committer);
opts->committer_name =
xmemdupz(id.name_begin, id.name_end - id.name_begin);
opts->committer_email =
xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
return 0;
}
int sequencer_continue(struct repository *r, struct replay_opts *opts)
{
struct todo_list todo_list = TODO_LIST_INIT;
@ -4495,9 +4477,6 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_populate_opts(opts))
return -1;
if (is_rebase_i(opts)) {
if (opts->committer_date_is_author_date && init_committer(opts))
return -1;
if ((res = read_populate_todo(r, &todo_list, opts)))
goto release_todo_list;
@ -5392,9 +5371,6 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
res = -1;
if (opts->committer_date_is_author_date && init_committer(opts))
goto cleanup;
if (checkout_onto(r, opts, onto_name, &oid, orig_head))
goto cleanup;

2
sequencer.h
View File

@ -50,8 +50,6 @@ struct replay_opts {
int mainline;
char *committer_name;
char *committer_email;
char *gpg_sign;
enum commit_msg_cleanup_mode default_msg_cleanup;
int explicit_cleanup;