From 1f8a67598a6cbf97fee8af2bf20b907c24b4d442 Mon Sep 17 00:00:00 2001 From: Jon Frisby Date: Fri, 20 Aug 2010 18:54:26 +0800 Subject: [PATCH] Use Grit to determine committer instead of executing a sub-shell and calling the git CLI. --- lib/gollum/frontend/app.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb index f7c1f4c9..0d6be29b 100644 --- a/lib/gollum/frontend/app.rb +++ b/lib/gollum/frontend/app.rb @@ -58,7 +58,7 @@ module Precious format = params[:format].intern name = params[:rename] if params[:rename] - wiki.update_page(page, name, format, params[:content], commit_message) + wiki.update_page(page, name, format, params[:content], commit_message(wiki)) redirect "/#{Gollum::Page.cname name}" end @@ -70,7 +70,7 @@ module Precious format = params[:format].intern begin - wiki.write_page(name, format, params[:content], commit_message) + wiki.write_page(name, format, params[:content], commit_message(wiki)) redirect "/#{name}" rescue Gollum::DuplicatePageError => e @message = "Duplicate page: #{e.message}" @@ -148,10 +148,10 @@ module Precious end end - def commit_message + def commit_message(wiki) { :message => params[:message], - :name => `git config --get user.name `.strip, - :email => `git config --get user.email`.strip } + :name => wiki.repo.config['user.name'], + :email => wiki.repo.config['user.email'] } end end end