aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/emacs/git.el
diff options
context:
space:
mode:
authorTom Prince <tom.prince@ualberta.net>2007-01-28 16:16:53 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-28 16:16:53 -0800
commite0d10e1c63bc52b37bbec99b07deee794058d9b4 (patch)
tree6fa070c660ff481e226b10aadbec5b7bb3b95cc7 /contrib/emacs/git.el
parent829a686f1b50ba96cac2d88494fa339efe0c0862 (diff)
downloadgit-e0d10e1c63bc52b37bbec99b07deee794058d9b4.tar.gz
[PATCH] Rename git-repo-config to git-config.
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs/git.el')
-rw-r--r--contrib/emacs/git.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index d90ba816e0..24629eb3e2 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -222,7 +222,7 @@ and returns the process output as a string."
"Return the name to use as GIT_COMMITTER_NAME."
; copied from log-edit
(or git-committer-name
- (git-repo-config "user.name")
+ (git-config "user.name")
(and (boundp 'add-log-full-name) add-log-full-name)
(and (fboundp 'user-full-name) (user-full-name))
(and (boundp 'user-full-name) user-full-name)))
@@ -231,7 +231,7 @@ and returns the process output as a string."
"Return the email address to use as GIT_COMMITTER_EMAIL."
; copied from log-edit
(or git-committer-email
- (git-repo-config "user.email")
+ (git-config "user.email")
(and (boundp 'add-log-mailing-address) add-log-mailing-address)
(and (fboundp 'user-mail-address) (user-mail-address))
(and (boundp 'user-mail-address) user-mail-address)))
@@ -298,9 +298,9 @@ and returns the process output as a string."
(git-get-string-sha1
(git-call-process-env-string nil "rev-parse" rev)))
-(defun git-repo-config (key)
+(defun git-config (key)
"Retrieve the value associated to KEY in the git repository config file."
- (let ((str (git-call-process-env-string nil "repo-config" key)))
+ (let ((str (git-call-process-env-string nil "config" key)))
(and str (car (split-string str "\n")))))
(defun git-symbolic-ref (ref)