[PATCHv4 0/4] Show author and/or committer in some cases

[PATCHv4 0/4] Show author and/or committer in some cases

[Santi Béjar]

Hi *,

  This patch series tries to make more evident the author and committer ident
in case the user might be using an unintended author/committer identity.

Santi

Santi Béjar (4):
  Preparation to call determine_author_info from prepare_to_commit
  commit: Show author if different from committer
  commit: Show committer if automatic
  user.warnautomatic: add config to control if the committer ident is
    shown

 Documentation/config.txt |    4 ++
 builtin-commit.c         |  112 +++++++++++++++++++++++++++++----------------
 cache.h                  |    2 +
 config.c                 |    9 ++++
 environment.c            |    2 +
 ident.c                  |    3 +
 t/t7502-commit.sh        |   38 ++++++++++++++++
 7 files changed, 130 insertions(+), 40 deletions(-)

[PATCHv4 1/4] Preparation to call determine_author_info from prepare_to_commit

[Santi Béjar]

From: Santi Béjar <sbjear@gmail.com>

Reorder functions definitions such that determine_author_info is
defined before prepare_to_commit. No code changes.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
 builtin-commit.c |   78 +++++++++++++++++++++++++++---------------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/builtin-commit.c b/builtin-commit.c
index 256181a..a37d8c3 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -395,6 +395,45 @@ 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)
+{
+	char *name, *email, *date;
+
+	name = getenv("GIT_AUTHOR_NAME");
+	email = getenv("GIT_AUTHOR_EMAIL");
+	date = getenv("GIT_AUTHOR_DATE");
+
+	if (use_message) {
+		const char *a, *lb, *rb, *eol;
+
+		a = strstr(use_message_buffer, "\nauthor ");
+		if (!a)
+			die("invalid commit: %s", use_message);
+
+		lb = strstr(a + 8, " <");
+		rb = strstr(a + 8, "> ");
+		eol = strchr(a + 8, '\n');
+		if (!lb || !rb || !eol)
+			die("invalid commit: %s", use_message);
+
+		name = xstrndup(a + 8, lb - (a + 8));
+		email = xstrndup(lb + 2, rb - (lb + 2));
+		date = xstrndup(rb + 2, eol - (rb + 2));
+	}
+
+	if (force_author) {
+		const char *lb = strstr(force_author, " <");
+		const char *rb = strchr(force_author, '>');
+
+		if (!lb || !rb)
+			die("malformed --author parameter");
+		name = xstrndup(force_author, lb - force_author);
+		email = xstrndup(lb + 2, rb - (lb + 2));
+	}
+
+	strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
+}
+
 static int prepare_to_commit(const char *index_file, const char *prefix)
 {
 	struct stat statbuf;
@@ -622,45 +661,6 @@ static int message_is_empty(struct strbuf *sb, int start)
 	return 1;
 }
 
-static void determine_author_info(struct strbuf *sb)
-{
-	char *name, *email, *date;
-
-	name = getenv("GIT_AUTHOR_NAME");
-	email = getenv("GIT_AUTHOR_EMAIL");
-	date = getenv("GIT_AUTHOR_DATE");
-
-	if (use_message) {
-		const char *a, *lb, *rb, *eol;
-
-		a = strstr(use_message_buffer, "\nauthor ");
-		if (!a)
-			die("invalid commit: %s", use_message);
-
-		lb = strstr(a + 8, " <");
-		rb = strstr(a + 8, "> ");
-		eol = strchr(a + 8, '\n');
-		if (!lb || !rb || !eol)
-			die("invalid commit: %s", use_message);
-
-		name = xstrndup(a + 8, lb - (a + 8));
-		email = xstrndup(lb + 2, rb - (lb + 2));
-		date = xstrndup(rb + 2, eol - (rb + 2));
-	}
-
-	if (force_author) {
-		const char *lb = strstr(force_author, " <");
-		const char *rb = strchr(force_author, '>');
-
-		if (!lb || !rb)
-			die("malformed --author parameter");
-		name = xstrndup(force_author, lb - force_author);
-		email = xstrndup(lb + 2, rb - (lb + 2));
-	}
-
-	strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
-}
-
 static int parse_and_validate_options(int argc, const char *argv[],
 				      const char * const usage[])
 {
-- 
1.5.5.1.224.gadb29

Re: [PATCHv4 1/4] Preparation to call determine_author_info from prepare_to_commit

[Santi Béjar]

On Sun, May 4, 2008 at 6:04 PM, Santi Béjar <sbejar@gmail.com> wrote:
> From: Santi Béjar <sbjear@gmail.com>

Gggrrr!! I thought I had fixed this. Please remove this line.

Santi

>
>  Reorder functions definitions such that determine_author_info is
>  defined before prepare_to_commit. No code changes.
>
>  Signed-off-by: Santi Béjar <sbejar@gmail.com>
>  ---
>   builtin-commit.c |   78 +++++++++++++++++++++++++++---------------------------
>   1 files changed, 39 insertions(+), 39 deletions(-)
>
>  diff --git a/builtin-commit.c b/builtin-commit.c
>  index 256181a..a37d8c3 100644
>  --- a/builtin-commit.c
>  +++ b/builtin-commit.c
>  @@ -395,6 +395,45 @@ 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)
>  +{
>  +       char *name, *email, *date;
>  +
>  +       name = getenv("GIT_AUTHOR_NAME");
>  +       email = getenv("GIT_AUTHOR_EMAIL");
>  +       date = getenv("GIT_AUTHOR_DATE");
>  +
>  +       if (use_message) {
>  +               const char *a, *lb, *rb, *eol;
>  +
>  +               a = strstr(use_message_buffer, "\nauthor ");
>  +               if (!a)
>  +                       die("invalid commit: %s", use_message);
>  +
>  +               lb = strstr(a + 8, " <");
>  +               rb = strstr(a + 8, "> ");
>  +               eol = strchr(a + 8, '\n');
>  +               if (!lb || !rb || !eol)
>  +                       die("invalid commit: %s", use_message);
>  +
>  +               name = xstrndup(a + 8, lb - (a + 8));
>  +               email = xstrndup(lb + 2, rb - (lb + 2));
>  +               date = xstrndup(rb + 2, eol - (rb + 2));
>  +       }
>  +
>  +       if (force_author) {
>  +               const char *lb = strstr(force_author, " <");
>  +               const char *rb = strchr(force_author, '>');
>  +
>  +               if (!lb || !rb)
>  +                       die("malformed --author parameter");
>  +               name = xstrndup(force_author, lb - force_author);
>  +               email = xstrndup(lb + 2, rb - (lb + 2));
>  +       }
>  +
>  +       strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
>  +}
>  +
>   static int prepare_to_commit(const char *index_file, const char *prefix)
>   {
>         struct stat statbuf;
>  @@ -622,45 +661,6 @@ static int message_is_empty(struct strbuf *sb, int start)
>         return 1;
>   }
>
>  -static void determine_author_info(struct strbuf *sb)
>  -{
>  -       char *name, *email, *date;
>  -
>  -       name = getenv("GIT_AUTHOR_NAME");
>  -       email = getenv("GIT_AUTHOR_EMAIL");
>  -       date = getenv("GIT_AUTHOR_DATE");
>  -
>  -       if (use_message) {
>  -               const char *a, *lb, *rb, *eol;
>  -
>  -               a = strstr(use_message_buffer, "\nauthor ");
>  -               if (!a)
>  -                       die("invalid commit: %s", use_message);
>  -
>  -               lb = strstr(a + 8, " <");
>  -               rb = strstr(a + 8, "> ");
>  -               eol = strchr(a + 8, '\n');
>  -               if (!lb || !rb || !eol)
>  -                       die("invalid commit: %s", use_message);
>  -
>  -               name = xstrndup(a + 8, lb - (a + 8));
>  -               email = xstrndup(lb + 2, rb - (lb + 2));
>  -               date = xstrndup(rb + 2, eol - (rb + 2));
>  -       }
>  -
>  -       if (force_author) {
>  -               const char *lb = strstr(force_author, " <");
>  -               const char *rb = strchr(force_author, '>');
>  -
>  -               if (!lb || !rb)
>  -                       die("malformed --author parameter");
>  -               name = xstrndup(force_author, lb - force_author);
>  -               email = xstrndup(lb + 2, rb - (lb + 2));
>  -       }
>  -
>  -       strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
>  -}
>  -
>   static int parse_and_validate_options(int argc, const char *argv[],
>                                       const char * const usage[])
>   {
>  --
>  1.5.5.1.224.gadb29
>
>

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

[Santi Béjar]

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()
 {
 	char *name, *email, *date;
 
@@ -431,7 +432,9 @@ static void determine_author_info(struct strbuf *sb)
 		email = xstrndup(lb + 2, rb - (lb + 2));
 	}
 
-	strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
+	author_name = name;
+	author_email = email;
+	author_date = date;
 }
 
 static int prepare_to_commit(const char *index_file, const char *prefix)
@@ -443,6 +446,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 	FILE *fp;
 	const char *hook_arg1 = NULL;
 	const char *hook_arg2 = NULL;
+	const char *author_ident;
+	const char *committer_ident;
 
 	if (!no_verify && run_hook(index_file, "pre-commit", NULL))
 		return 0;
@@ -522,6 +527,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 
 	strbuf_release(&sb);
 
+	determine_author_info();
+
 	if (use_editor) {
 		if (in_merge)
 			fprintf(fp,
@@ -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")));
+		if (strcmp(author_ident, committer_ident))
+			fprintf(fp,
+				"#\n"
+				"# Author:    %s\n"
+				"#\n",
+				author_ident);
+
 		saved_color_setting = wt_status_use_color;
 		wt_status_use_color = 0;
 		commitable = run_status(fp, index_file, prefix, 1);
@@ -920,7 +938,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
 	}
 
-	determine_author_info(&sb);
+	strbuf_addf(&sb, "author %s\n",
+		    fmt_ident(author_name, author_email, author_date, IDENT_ERROR_ON_NO_NAME));
 	strbuf_addf(&sb, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
 	if (!is_encoding_utf8(git_commit_encoding))
 		strbuf_addf(&sb, "encoding %s\n", git_commit_encoding);
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 284c941..0b1db40 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -154,6 +154,18 @@ test_expect_success 'cleanup commit messages (strip,-F,-e)' '
 
 '
 
+echo "#
+# Author:    $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+#" >> expect
+
+test_expect_success 'author different from committer' '
+
+	echo >>negative &&
+	git commit -e -m "sample"
+	head -n 7 .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
+'
+
 pwd=`pwd`
 cat >> .git/FAKE_EDITOR << EOF
 #! /bin/sh
-- 
1.5.5.1.224.gadb29

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

[Junio C Hamano]

Santi Béjar <sbejar@gmail.com> writes:

> 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).

> @@ -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.

[PATCHv4 3/4] commit: Show committer if automatic

[Santi Béjar]

To warn the user in case he/she might be using an unintended
committer identity.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
 builtin-commit.c  |   19 ++++++++++++++++---
 cache.h           |    1 +
 config.c          |    4 ++++
 environment.c     |    1 +
 ident.c           |    3 +++
 t/t7502-commit.sh |   15 +++++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/builtin-commit.c b/builtin-commit.c
index d03b6b2..353f9c7 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -448,6 +448,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 	const char *hook_arg2 = NULL;
 	const char *author_ident;
 	const char *committer_ident;
+	int showed_ident = 0;
 
 	if (!no_verify && run_hook(index_file, "pre-commit", NULL))
 		return 0;
@@ -528,6 +529,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 	strbuf_release(&sb);
 
 	determine_author_info();
+	/* To know if the committer ident is automatic */
+	git_committer_info(0);
 
 	if (use_editor) {
 		if (in_merge)
@@ -558,11 +561,21 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 					 getenv("GIT_COMMITTER_EMAIL")));
 		if (strcmp(author_ident, committer_ident))
 			fprintf(fp,
-				"#\n"
-				"# Author:    %s\n"
-				"#\n",
+				"%s"
+				"# Author:    %s\n",
+				showed_ident++ ? "" : "#\n",
 				author_ident);
 
+		if (!user_explicit)
+			fprintf(fp,
+				"%s"
+				"# Committer: %s\n",
+				showed_ident++ ? "" : "#\n",
+				committer_ident);
+
+		if (showed_ident)
+			fprintf(fp, "#\n");
+
 		saved_color_setting = wt_status_use_color;
 		wt_status_use_color = 0;
 		commitable = run_status(fp, index_file, prefix, 1);
diff --git a/cache.h b/cache.h
index 5a28ddd..e8b26cf 100644
--- a/cache.h
+++ b/cache.h
@@ -718,6 +718,7 @@ extern int config_error_nonbool(const char *);
 #define MAX_GITNAME (1000)
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
+extern int user_explicit;
 
 extern const char *git_commit_encoding;
 extern const char *git_log_output_encoding;
diff --git a/config.c b/config.c
index b0ada51..e49804a 100644
--- a/config.c
+++ b/config.c
@@ -443,6 +443,8 @@ int git_default_config(const char *var, const char *value)
 		if (!value)
 			return config_error_nonbool(var);
 		strlcpy(git_default_name, value, sizeof(git_default_name));
+		if (git_default_email[0])
+			user_explicit = 1;
 		return 0;
 	}
 
@@ -450,6 +452,8 @@ int git_default_config(const char *var, const char *value)
 		if (!value)
 			return config_error_nonbool(var);
 		strlcpy(git_default_email, value, sizeof(git_default_email));
+		if (git_default_name[0])
+			user_explicit = 1;
 		return 0;
 	}
 
diff --git a/environment.c b/environment.c
index 6739a3f..b941971 100644
--- a/environment.c
+++ b/environment.c
@@ -11,6 +11,7 @@
 
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
+int user_explicit = 0;
 int trust_executable_bit = 1;
 int quote_path_fully = 1;
 int has_symlinks = 1;
diff --git a/ident.c b/ident.c
index ed44a53..67ccbf3 100644
--- a/ident.c
+++ b/ident.c
@@ -250,6 +250,9 @@ const char *git_author_info(int flag)
 
 const char *git_committer_info(int flag)
 {
+	if (getenv("GIT_COMMITTER_NAME") &&
+	    getenv("GIT_COMMITTER_EMAIL"))
+		user_explicit = 1;
 	return fmt_ident(getenv("GIT_COMMITTER_NAME"),
 			 getenv("GIT_COMMITTER_EMAIL"),
 			 getenv("GIT_COMMITTER_DATE"),
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 0b1db40..018060c 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -166,6 +166,21 @@ test_expect_success 'author different from committer' '
 	test_cmp expect actual
 '
 
+sed -i '$d' expect
+echo "# Committer:
+#" >> expect
+unset GIT_COMMITTER_EMAIL
+unset GIT_COMMITTER_NAME
+
+test_expect_success 'committer is automatic' '
+
+	echo >>negative &&
+	git commit -e -m "sample"
+	head -n 8 .git/COMMIT_EDITMSG |	\
+	sed "s/^# Committer: .*/# Committer:/" >actual &&
+	test_cmp expect actual
+'
+
 pwd=`pwd`
 cat >> .git/FAKE_EDITOR << EOF
 #! /bin/sh
-- 
1.5.5.1.224.gadb29

[PATCHv4 4/4] user.warnautomatic: add config to control if the committer ident is shown

[Santi Béjar]

Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
 Documentation/config.txt |    4 ++++
 builtin-commit.c         |    2 +-
 cache.h                  |    1 +
 config.c                 |    5 +++++
 environment.c            |    1 +
 t/t7502-commit.sh        |   15 +++++++++++++--
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 824e416..9c770a6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -994,6 +994,10 @@ user.signingkey::
 	unchanged to gpg's --local-user parameter, so you may specify a key
 	using any method that gpg supports.
 
+user.warnautomatic::
+	A boolean to show the committer ident while committing in the editor
+	if it is set automatically. Defaults to true.
+
 whatchanged.difftree::
 	The default linkgit:git-diff-tree[1] arguments to be used
 	for linkgit:git-whatchanged[1].
diff --git a/builtin-commit.c b/builtin-commit.c
index 353f9c7..381e3c8 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -566,7 +566,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 				showed_ident++ ? "" : "#\n",
 				author_ident);
 
-		if (!user_explicit)
+		if (!user_explicit && user_warnautomatic)
 			fprintf(fp,
 				"%s"
 				"# Committer: %s\n",
diff --git a/cache.h b/cache.h
index e8b26cf..5d0dd23 100644
--- a/cache.h
+++ b/cache.h
@@ -719,6 +719,7 @@ extern int config_error_nonbool(const char *);
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
 extern int user_explicit;
+extern int user_warnautomatic;
 
 extern const char *git_commit_encoding;
 extern const char *git_log_output_encoding;
diff --git a/config.c b/config.c
index e49804a..1588053 100644
--- a/config.c
+++ b/config.c
@@ -457,6 +457,11 @@ int git_default_config(const char *var, const char *value)
 		return 0;
 	}
 
+	if (!strcmp(var, "user.warnautomatic")) {
+		user_warnautomatic = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "i18n.commitencoding"))
 		return git_config_string(&git_commit_encoding, var, value);
 
diff --git a/environment.c b/environment.c
index b941971..6b6ede6 100644
--- a/environment.c
+++ b/environment.c
@@ -12,6 +12,7 @@
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int user_explicit = 0;
+int user_warnautomatic = 1;
 int trust_executable_bit = 1;
 int quote_path_fully = 1;
 int has_symlinks = 1;
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 018060c..a63f9c4 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -166,14 +166,25 @@ test_expect_success 'author different from committer' '
 	test_cmp expect actual
 '
 
+unset GIT_COMMITTER_EMAIL
+unset GIT_COMMITTER_NAME
+
+test_expect_success 'committer is automatic but user.warnautomatic=no' '
+
+	git config user.warnautomatic no
+	echo >>negative &&
+	git commit -e -m "sample"
+	head -n 7 .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
+'
+
 sed -i '$d' expect
 echo "# Committer:
 #" >> expect
-unset GIT_COMMITTER_EMAIL
-unset GIT_COMMITTER_NAME
 
 test_expect_success 'committer is automatic' '
 
+	git config --unset user.warnautomatic
 	echo >>negative &&
 	git commit -e -m "sample"
 	head -n 8 .git/COMMIT_EDITMSG |	\
-- 
1.5.5.1.224.gadb29

Re: [PATCHv4 4/4] user.warnautomatic: add config to control if the committer ident is shown

[Junio C Hamano]

Santi Béjar <sbejar@gmail.com> writes:

> Signed-off-by: Santi Béjar <sbejar@gmail.com>

By setting this new variable the user can squelch undesired noise the
previous change introduces, but the user can just set user.name and
user.email to desired values to squelch it anyway.

So either this new variable is superfluous, or the previous change is too
susceptible to produce false positives that need squelching with such a
variable, or both.  In any case, not a very good sign.

Re: [PATCHv4 4/4] user.warnautomatic: add config to control if the committer ident is shown

[Santi Béjar]

On Wed, May 7, 2008 at 6:12 PM, Junio C Hamano <junio@pobox.com> wrote:
> Santi Béjar <sbejar@gmail.com> writes:
>
>  > Signed-off-by: Santi Béjar <sbejar@gmail.com>
>
>  By setting this new variable the user can squelch undesired noise the
>  previous change introduces, but the user can just set user.name and
>  user.email to desired values to squelch it anyway.

Or the user prefers the automatic ident.

>
>  So either this new variable is superfluous, or the previous change is too
>  susceptible to produce false positives that need squelching with such a
>  variable, or both.  In any case, not a very good sign.

For me it is superfluous, as I prefer to see what is the committer
ident when it is generated.
I even said I prefer just showing the automatic ident. I sent it in
case it was decided it was worth.

Santi

Re: [PATCHv4 0/4] Show author and/or committer in some cases

[Santi Béjar]

On Sun, May 4, 2008 at 6:04 PM, Santi Béjar <sbejar@gmail.com> wrote:
> Hi *,
>
>   This patch series tries to make more evident the author and committer ident
>  in case the user might be using an unintended author/committer identity.
>

Oops, I send it without saving the buffer.

Changes since last round (v3?):

	* removed an unused function
 	* Add comment why git_committer_info is called discarding the value
	* Minor changes to the tests

>  Santi
>
>  Santi Béjar (4):
>   Preparation to call determine_author_info from prepare_to_commit
>   commit: Show author if different from committer
>   commit: Show committer if automatic
>   user.warnautomatic: add config to control if the committer ident is
>     shown
>
>   Documentation/config.txt |    4 ++
>   builtin-commit.c         |  112 +++++++++++++++++++++++++++++----------------
>   cache.h                  |    2 +
>   config.c                 |    9 ++++
>   environment.c            |    2 +
>   ident.c                  |    3 +
>   t/t7502-commit.sh        |   38 ++++++++++++++++
>   7 files changed, 130 insertions(+), 40 deletions(-)
>
>