deac
/
middleman-deploy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #70 from Gee-Bee/git-user-details 

Respect user details of git repo.
master
Karl Freeman 2014-11-21 17:08:03 +00:00
parent 217af0d33c bfe6473000
commit bd5e214614
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/middleman-deploy/strategies/git/base.rb
View File

@ -3,13 +3,15 @@ module Middleman
module Strategies
module Git
class Base
attr_accessor :branch, :build_dir, :remote, :commit_message
attr_accessor :branch, :build_dir, :remote, :commit_message, :user_name, :user_email
def initialize(build_dir, remote, branch, commit_message)
self.branch = branch
self.build_dir = build_dir
self.remote = remote
self.commit_message = commit_message
self.user_name = `git config --get user.name`
self.user_email = `git config --get user.email`
end
def process

6
lib/middleman-deploy/strategies/git/force_push.rb
View File

@ -19,12 +19,18 @@ module Middleman
unless File.exist?('.git')
`git init`
`git remote add origin #{url}`
`git config user.name "#{self.user_name}"`
`git config user.name "#{self.user_email}"`
else
# check if the remote repo has changed
unless url == `git config --get remote.origin.url`.chop
`git remote rm origin`
`git remote add origin #{url}`
end
# check if the user name has changed
`git config user.name "#{self.user_name}"` unless self.user_name == `git config --get user.name`
# check if the user email has changed
`git config user.email "#{self.user_email}"` unless self.user_email == `git config --get user.email`
end
end