aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-07-10 20:27:54 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-10 21:12:40 -0700
commit0b0fe4a65d24d7c17d72706e5cd179ecc7134721 (patch)
tree282915de8acd8b0003c7d6cc1bec816de0543d3c
parentb75a82b75402c9462cfd2e9891d2fbe7ce6239f4 (diff)
downloadgit-0b0fe4a65d24d7c17d72706e5cd179ecc7134721.tar.gz
git-0b0fe4a65d24d7c17d72706e5cd179ecc7134721.tar.xz
Allow user.name and user.email to drive reflog entry.
Apparently calling setup_ident() after git_config causes the user.name and user.email values read from the config file to be replaced with the data obtained from the host. This means that users who have setup their email address in user.email will instead be writing reflog entries with their hostname. Moving setup_ident() to before git_config in update-ref resolves this ordering problem. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-update-ref.c1
-rw-r--r--refs.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index 00333c7e7..83094abe0 100644
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -12,6 +12,7 @@ int cmd_update_ref(int argc, const char **argv, char **envp)
unsigned char sha1[20], oldsha1[20];
int i;
+ setup_ident();
setup_git_directory();
git_config(git_default_config);
diff --git a/refs.c b/refs.c
index 2d9c1dc5d..56db39445 100644
--- a/refs.c
+++ b/refs.c
@@ -379,7 +379,6 @@ static int log_ref_write(struct ref_lock *lock,
lock->log_file, strerror(errno));
}
- setup_ident();
committer = git_committer_info(1);
if (msg) {
maxlen = strlen(committer) + strlen(msg) + 2*40 + 5;