[PATCH 1/2] commit: Show committer if automatic
To remind the committer ident in case it is not what you want (taken from the gecos field, want to use different ident in different repositories).
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
builtin-commit.c | 40 +++++++++++++++++++++++++++++++++++++---
cache.h | 1 +
config.c | 4 ++++
environment.c | 1 +
ident.c | 3 +++
t/t7502-commit.sh | 13 +++++++++++++
6 files changed, 59 insertions(+), 3 deletions(-)
Show changes to 6 files +59 −3
builtin-commit.c, cache.h, config.c, environment.c, ident.c, t/t7502-commit.sh
diff --git a/builtin-commit.c b/builtin-commit.c
index 057749b..b7cc382 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -437,6 +437,29 @@ static void determine_author_info()
author_date = date;
}
+const char *get_parent_ident()
+{
+ unsigned char sha1[20];
+ struct commit *commit;
+ const char *a, *lb, *rb, *eol;
+
+
+ get_sha1("HEAD", sha1);
+ commit = lookup_commit_reference(sha1);
+ if (!commit)
+ return NULL;
+
+ a = strstr(commit->buffer, "\ncommitter ");
+
+ lb = strstr(a + 11, " <");
+ rb = strstr(a + 11, "> ");
+ eol = strchr(a + 11, '\n');
+ if (!lb || !rb || !eol)
+ return NULL;
+
+ return xstrndup(a + 11, rb + 1 - (a + 11));
+}
+
static int prepare_to_commit(const char *index_file, const char *prefix)
{
struct stat statbuf;
@@ -448,6 +471,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 +552,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
strbuf_release(&sb);
determine_author_info();
+ git_committer_info(0);
if (use_editor) {
if (in_merge)
@@ -558,11 +583,20 @@ 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",
fmt_name(author_name, author_email));
+ 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 11de910..8f65c39 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -165,6 +165,19 @@ test_expect_success 'author different from committer' '
test_cmp expect actual
'
+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 7 .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.223.g2532
