git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv4 2/4] commit: Show author if different from committer

From
Junio C Hamano <junio@pobox.com>
Date
May 6, 2008, 23:34 UTC
Message-ID
<7vej8fgg6b.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1209917092-12146-3-git-send-email-sbejar@gmail.com>
Santi Béjar <sbejar@gmail.com> writes:
Show 29 quoted lines
> That would help reassure anybody while committing other's changes.
>
> Signed-off-by: Santi Béjar <sbejar@gmail.com>
> ---
>  builtin-commit.c  |   25 ++++++++++++++++++++++---
>  t/t7502-commit.sh |   12 ++++++++++++
>  2 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/builtin-commit.c b/builtin-commit.c
> index a37d8c3..d03b6b2 100644
> --- a/builtin-commit.c
> +++ b/builtin-commit.c
> @@ -47,6 +47,7 @@ static enum {
>  
>  static char *logfile, *force_author, *template_file;
>  static char *edit_message, *use_message;
> +static char *author_name, *author_email, *author_date;
>  static int all, edit_flag, also, interactive, only, amend, signoff;
>  static int quiet, verbose, untracked_files, no_verify, allow_empty;
>  /*
> @@ -395,7 +396,7 @@ static int is_a_merge(const unsigned char *sha1)
>  
>  static const char sign_off_header[] = "Signed-off-by: ";
>  
> -static void determine_author_info(struct strbuf *sb)
> +static void determine_author_info(void)
>  {
>  	char *name, *email, *date;
>  

The parameter list here should be "(void)" like the above (I've already touched up).

Show 8 quoted lines
> @@ -545,6 +552,17 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
>  		if (only_include_assumed)
>  			fprintf(fp, "# %s\n", only_include_assumed);
>  
> +		author_ident = xstrdup(fmt_name(author_name, author_email));
> +		committer_ident =
> +			xstrdup(fmt_name(getenv("GIT_COMMITTER_NAME"),
> +					 getenv("GIT_COMMITTER_EMAIL")));

The lifetime of these two variables are inside "if (use_editor)" so it would be better to move the decl inside it. Then it would become more obvious that these two leaks and are safe to free at the end of the scope.

Previous: Santi BéjarNext: Santi Béjar
Message 5 of 10 in “[PATCHv4 0/4] Show author and/or committer in some cases”
  1. Santi BéjarMay 4, 2008
  2. 1/4 Preparation to call determine_author_info from prepare_to_commitSanti Béjar, May 4, 2008
  3. Santi BéjarMay 4, 2008
  4. 2/4 commit: Show author if different from committerSanti Béjar, May 4, 2008
  5. Junio C HamanoMay 6, 2008
  6. 3/4 commit: Show committer if automaticSanti Béjar, May 4, 2008
  7. 4/4 user.warnautomatic: add config to control if the committer ident is shownSanti Béjar, May 4, 2008
  8. Junio C HamanoMay 7, 2008
  9. Santi BéjarMay 7, 2008
  10. Santi BéjarMay 4, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.