From: Junio C Hamano Date: Mon, 9 Nov 2020 22:06:27 +0000 (-0800) Subject: Merge branch 'jk/committer-date-is-author-date-fix-simplify' X-Git-Tag: v2.30.0-rc0~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a44c9c0d05839d6402c84a80acd0c2525f3a85e;p=thirdparty%2Fgit.git 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 --- 6a44c9c0d05839d6402c84a80acd0c2525f3a85e diff --cc builtin/am.c index b727449aed,b1f45eb768..f22c73a05b --- a/builtin/am.c +++ b/builtin/am.c @@@ -173,10 -161,8 +161,8 @@@ static void am_state_release(struct am_ free(state->author_name); free(state->author_email); free(state->author_date); - free(state->committer_name); - free(state->committer_email); free(state->msg); - argv_array_clear(&state->git_apply_opts); + strvec_clear(&state->git_apply_opts); } /**