Re: [PATCH 1/6] builtin-commit: fix author date with --amend --author=<author>

From: Kristian Høgsberg <krh@redhat.com>
Date: Nov 12, 2007, 19:38 UTC
Message-ID: <1194896334.2869.7.camel@hinata.boston.redhat.com>
In-Reply-To: <Pine.LNX.4.64.0711111735100.4362@racer.site>

On Sun, 2007-11-11 at 17:35 +0000, Johannes Schindelin wrote:

> When amending a commit with a new author, the author date is taken
> from the original commit.

The new determine_author_info() should fix this. There was a problem earlier that Junio pointed out and I sent a patch to update determine_author_info() to do the right thing for amend commits. The test suite still pass without this patch, and if you look carefully a determine_author_info(), you can see it does the right thing:

  1) Default to getenv for name, email and date

  2) If a commit has been specified (-c, -C or --amend), we parse the
author name, email and date from use_message_buffer, which holds the
commit, overriding the values from getenv.

  3) If --author has be passed, we parse name and email from the
argument and override whatever name and email the two previous steps
came up with.

Then we add the author line to the commit buffer under construction based on these values.

I suggest we back this patch out.

cheers, Kristian

Show 39 quoted lines

> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  builtin-commit.c |   16 ++++++++++++++++
>  1 files changed, 16 insertions(+), 0 deletions(-)
> 
> diff --git a/builtin-commit.c b/builtin-commit.c
> index a84a729..6be6def 100644
> --- a/builtin-commit.c
> +++ b/builtin-commit.c
> @@ -527,6 +527,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
>  	} else if (amend) {
>  		struct commit_list *c;
>  		struct commit *commit;
> +		const char *author;
>  
>  		reflog_msg = "commit (amend)";
>  		commit = lookup_commit(head_sha1);
> @@ -536,6 +537,21 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
>  		for (c = commit->parents; c; c = c->next)
>  			strbuf_addf(&sb, "parent %s\n",
>  				      sha1_to_hex(c->item->object.sha1));
> +
> +		/* determine author date */
> +		author = strstr(commit->buffer, "\nauthor");
> +		if (author && !memmem(commit->buffer,
> +					author + 1 - commit->buffer,
> +					"\n\n", 2)) {
> +			const char *email_end = strchr(author + 1, '>');
> +			const char *line_end = strchr(author + 1, '\n');
> +			if (email_end && line_end && email_end < line_end) {
> +				char *date = xstrndup(email_end + 1,
> +					line_end - email_end - 1);
> +				setenv("GIT_AUTHOR_DATE", date, 1);
> +				free(date);
> +			}
> +		}
>  	} else if (in_merge) {
>  		struct strbuf m;
>  		FILE *fp;