This allows the use of author abbreviations when specifying commit
authors via the --author option to git commit. "--author=$key" is
resolved by looking up "user.$key.name" and "user.$key.email" in the
config.
Signed-off-by: Michael J Gruber <michaeljgruber+gmane@xxxxxxxxxxx>
---
In an ideal word, all my collaborators would exchange changes as git
patches (or even via pull/push). In the real world, they send new
versions which I integrate (after dealing with their whitespace and encoding changes...).
Therefore, being able to say
"git commit --author=mickey"
and having git translate "mickey" into "Mickey Mouse <mickey@xxxxxxxxxxx>"
is a real time saver. The patch accomplishes this by reading config keys "user.mickey.name" and "user.mickey.email" when encountering an
--author argument without "<>".
If there's interest in this patch I'll follow up with a documentation patch.
The "--committer" argument to git commit is not treated because I don't
consider it worthwhile.
Note that the implementation is different from git-svn's author file on
purpose because it serves a different purpose.
Michael
P.S.: That's my first patch here. Yes, I've read Doc/SubmittingPatches.
So, if something's wrong, please be gentle but not overly so ;)
builtin-commit.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c
index 649c8be..d90e2f4 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -53,6 +53,12 @@ static char *author_name, *author_email, *author_date;
static int all, edit_flag, also, interactive, only, amend, signoff;
static int quiet, verbose, no_verify, allow_empty;
static char *untracked_files_arg;
+struct user {
+ char *name, *full_name, *email;
+};
+static struct user **users;
+static int users_alloc;
+static int users_nr;
/*
* The default commit message cleanup mode will remove the lines
* beginning with # (shell comments) and leading and trailing
@@ -406,6 +412,7 @@ static const char sign_off_header[] = "Signed-off-by: ";
static void determine_author_info(void)
{
char *name, *email, *date;
+ int i;
name = getenv("GIT_AUTHOR_NAME");
email = getenv("GIT_AUTHOR_EMAIL");
@@ -429,10 +436,22 @@ static void determine_author_info(void)
date = xstrndup(rb + 2, eol - (rb + 2));
}
+ author_date = date;
+
if (force_author) {
const char *lb = strstr(force_author, " <");
const char *rb = strchr(force_author, '>');
+ if (!lb && !rb) {
+ for (i=0; i < users_nr; i++) {
+ if (!strcmp(force_author, users[i]->name)) {
+ author_name = users[i]->full_name;
+ author_email = users[i]->email;
+ return;
+ }
+ }
+ }
+
if (!lb || !rb)
die("malformed --author parameter");
name = xstrndup(force_author, lb - force_author);
@@ -441,7 +460,6 @@ static void determine_author_info(void)
author_name = name;
author_email = email;
- author_date = date;
}
static int prepare_to_commit(const char *index_file, const char *prefix)
@@ -888,11 +906,56 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
}
}
+static struct user *make_user(const char *name, int len)
+{
+ struct user *ret;
+ int i;
+
+ for (i = 0; i < users_nr; i++) {
+ if (len ? (!strncmp(name, users[i]->name, len) &&
+ !users[i]->name[len]) :
+ !strcmp(name, users[i]->name))
+ return users[i];
+ }
+
+ ALLOC_GROW(users, users_nr + 1, users_alloc);
+ ret = xcalloc(1, sizeof(struct user));
+ users[users_nr++] = ret;
+ if (len)
+ ret->name = xstrndup(name, len);
+ else
+ ret->name = xstrdup(name);
+
+ return ret;
+}
+
static int git_commit_config(const char *k, const char *v, void *cb)
{
+ const char *name;
+ const char *subkey;
+ struct user *user;
+
if (!strcmp(k, "commit.template"))
return git_config_string(&template_file, k, v);
+ if (!prefixcmp(k, "user.")) {
+ name = k + 5;
+ subkey = strrchr(name, '.');
+ if (!subkey)
+ return 0;
+ user = make_user(name, subkey - name);
+ if (!strcmp(subkey, ".name")) {
+ if (!v)
+ return config_error_nonbool(k);
+ user->full_name = xstrdup(v);
+ } else if (!strcmp(subkey, ".email")) {
+ if (!v)
+ return config_error_nonbool(k);
+ user->email = xstrdup(v);
+ }
+ return 0;
+ }
+
return git_status_config(k, v, cb);
}
--
1.6.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
