[PATCH] Introduce new configuation option to override committer information

[Ramkumar Ramachandra <artagnon@gmail.com>]

Currently, there is no way to set committer information on a
per-repository basis. The 'user.name' and 'user.email' configuration
options set both author and committer information. To solve this,
introduce 'user.committername' and 'user.committeremail' configuration
options to override committer name and email respectively.

Reported-by: Stephen Kelly <steveire@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 Documentation/config.txt |   29 +++++++++++++++++++++++------
 builtin/blame.c          |    2 +-
 builtin/commit.c         |    4 ++--
 cache.h                  |    4 +++-
 config.c                 |   15 +++++++++++++++
 environment.c            |    2 ++
 ident.c                  |   18 ++++++++++++------
 7 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6a6c0b5..5405a4c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1842,14 +1842,31 @@ url.<base>.pushInsteadOf::
 	setting for that remote.
 
 user.email::
-	Your email address to be recorded in any newly created commits.
-	Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
-	'EMAIL' environment variables.  See linkgit:git-commit-tree[1].
+	The email address to be recorded in any newly created commits.
+	Sets both author and committer email.  To override only
+	committer email, use 'user.committeremail'.  Can be overridden
+	by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and 'EMAIL'
+	environment variables.  See linkgit:git-commit-tree[1].
 
 user.name::
-	Your full name to be recorded in any newly created commits.
-	Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
-	environment variables.  See linkgit:git-commit-tree[1].
+	The full name to be recorded in any newly created commits.
+	Sets both author and committer name.  To override only
+	committer name, use 'user.committername'.  Can be overridden
+	by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment
+	variables.  See linkgit:git-commit-tree[1].
+
+user.committeremail::
+	The email address of the committer to use while recording
+	newly created commits.  Used to override committer email
+	specified in 'user.email'.  Can be overridden by the
+	'GIT_COMMITTER_EMAIL', and 'EMAIL' environment variables.  See
+	linkgit:git-commit-tree[1].
+
+user.committername::
+	The full name of the committer to use while recording newly
+	created commits.  Used to override committer name specified in
+	'user.name'.  Can be overridden by the 'GIT_COMMITTER_NAME'
+	environment variable.  See linkgit:git-commit-tree[1].
 
 user.signingkey::
 	If linkgit:git-tag[1] is not selecting the key you want it to
diff --git a/builtin/blame.c b/builtin/blame.c
index f5fccc1..1f47130 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2146,7 +2146,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
 	cache_tree_invalidate_path(active_cache_tree, path);
 
 	commit->buffer = xmalloc(400);
-	ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
+	ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0, 0);
 	snprintf(commit->buffer, 400,
 		"tree 0000000000000000000000000000000000000000\n"
 		"parent %s\n"
diff --git a/builtin/commit.c b/builtin/commit.c
index 4fd1a16..a449a13 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1352,8 +1352,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	}
 
 	if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
-			fmt_ident(author_name, author_email, author_date,
-				IDENT_ERROR_ON_NO_NAME))) {
+				fmt_ident(author_name, author_email, author_date,
+				0, IDENT_ERROR_ON_NO_NAME))) {
 		rollback_index_files();
 		die("failed to write commit object");
 	}
diff --git a/cache.h b/cache.h
index 33decd9..91740c0 100644
--- a/cache.h
+++ b/cache.h
@@ -833,7 +833,7 @@ enum date_mode parse_date_format(const char *format);
 #define IDENT_NO_DATE	       4
 extern const char *git_author_info(int);
 extern const char *git_committer_info(int);
-extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
+extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int, int);
 extern const char *fmt_name(const char *name, const char *email);
 extern const char *git_editor(void);
 extern const char *git_pager(int stdout_is_tty);
@@ -1008,6 +1008,8 @@ extern const char *config_exclusive_filename;
 #define MAX_GITNAME (1000)
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
+extern char git_default_committeremail[MAX_GITNAME];
+extern char git_default_committername[MAX_GITNAME];
 #define IDENT_NAME_GIVEN 01
 #define IDENT_MAIL_GIVEN 02
 #define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
diff --git a/config.c b/config.c
index c63d683..ba130dc 100644
--- a/config.c
+++ b/config.c
@@ -665,6 +665,21 @@ static int git_default_user_config(const char *var, const char *value)
 		return 0;
 	}
 
+	if (!strcmp(var, "user.committername")) {
+		if (!value)
+			return config_error_nonbool(var);
+		strlcpy(git_default_committername, value,
+			sizeof(git_default_committername));
+		return 0;
+	}
+
+	if (!strcmp(var, "user.committeremail")) {
+		if (!value)
+			return config_error_nonbool(var);
+		strlcpy(git_default_committeremail, value,
+			sizeof(git_default_committeremail));
+		return 0;
+	}
 	/* Add other config variables here and to Documentation/config.txt. */
 	return 0;
 }
diff --git a/environment.c b/environment.c
index de5581f..1277764 100644
--- a/environment.c
+++ b/environment.c
@@ -11,6 +11,8 @@
 
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
+char git_default_committeremail[MAX_GITNAME];
+char git_default_committername[MAX_GITNAME];
 int user_ident_explicitly_given;
 int trust_executable_bit = 1;
 int trust_ctime = 1;
diff --git a/ident.c b/ident.c
index 9e24388..b3dcaaa 100644
--- a/ident.c
+++ b/ident.c
@@ -183,7 +183,7 @@ static const char *env_hint =
 "\n";
 
 const char *fmt_ident(const char *name, const char *email,
-		      const char *date_str, int flag)
+		const char *date_str, int committer_info, int flag)
 {
 	static char buffer[1000];
 	char date[50];
@@ -193,9 +193,15 @@ const char *fmt_ident(const char *name, const char *email,
 	int name_addr_only = (flag & IDENT_NO_DATE);
 
 	setup_ident();
-	if (!name)
+	if (committer_info) {
+		if (!name)
+			name = git_default_committername;
+		if (!email)
+			email = git_default_committeremail;
+	}
+	if (!name || !*name)
 		name = git_default_name;
-	if (!email)
+	if (!email || !*email)
 		email = git_default_email;
 
 	if (!*name) {
@@ -237,7 +243,7 @@ const char *fmt_ident(const char *name, const char *email,
 
 const char *fmt_name(const char *name, const char *email)
 {
-	return fmt_ident(name, email, NULL, IDENT_ERROR_ON_NO_NAME | IDENT_NO_DATE);
+	return fmt_ident(name, email, NULL, 0, IDENT_ERROR_ON_NO_NAME | IDENT_NO_DATE);
 }
 
 const char *git_author_info(int flag)
@@ -245,7 +251,7 @@ const char *git_author_info(int flag)
 	return fmt_ident(getenv("GIT_AUTHOR_NAME"),
 			 getenv("GIT_AUTHOR_EMAIL"),
 			 getenv("GIT_AUTHOR_DATE"),
-			 flag);
+			 0, flag);
 }
 
 const char *git_committer_info(int flag)
@@ -257,7 +263,7 @@ const char *git_committer_info(int flag)
 	return fmt_ident(getenv("GIT_COMMITTER_NAME"),
 			 getenv("GIT_COMMITTER_EMAIL"),
 			 getenv("GIT_COMMITTER_DATE"),
-			 flag);
+			 1, flag);
 }
 
 int user_ident_sufficiently_given(void)
-- 
1.7.2.2.409.gdbb11.dirty