jbox-gitolite 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4253d62c4de6da94cf98aaf8256530f1220ed4b
-  data.tar.gz: d49c94d508240a776dd40e7a340689c619312efa
+  metadata.gz: d0ce6bd59ddf8882ee481926b27c2cced1b6230a
+  data.tar.gz: d899933df8b5c6b4d2427f1822f6b27e59ee74d8
 SHA512:
-  metadata.gz: 7e245a4c9dfdc7555c34456f80b0603aa1c20df05ec822e4809a782f2a4a000f23622d6348cca1e9c374067cbe6bc67d462af6ec7d151aff7847fb0d81ce589e
-  data.tar.gz: 67e90dbb7cd7834c1c287555eeecfcf39c60689ee76f60cd899946b929e43554bf7fb88b2b494091bce330b39fe54d1eb7770eec5f3e78e8440309c5726d729d
+  metadata.gz: 6946a29f15c4b7cbeb6ca73e03fa840e7620d2a9d9eb6799227906411a03dfbd9a7c3be75d562958106d49e5cec8484331062a7409d01764eccf5eaf7f727712
+  data.tar.gz: 9ab24f2034fb783dabdd0896c26de20f2aa3c6e2367e445b9353bc5b23ba4f80e457e84c3ad5283119e4ad0231ea952b02423a02d5989a2ea12728d5ef7de947

data/lib/gitolite/gitolite_admin.rb

@@ -100,6 +100,11 @@ module Gitolite
     end
 
 
+    def git_options
+      @git_options.clone
+    end
+
+
     def config
       @config ||= load_config
     end
@@ -131,8 +136,8 @@ module Gitolite
     # git repo to HEAD and reloading the entire repository
     # Note that this will also delete all untracked files
     def reset!
-      @gl_admin.git.native(:reset, @git_options.merge(:hard => true), 'HEAD')
-      @gl_admin.git.native(:clean, @git_options.merge(:d => true, :q => true, :f => true))
+      @gl_admin.git.native(:reset, git_options.merge(:hard => true), 'HEAD')
+      @gl_admin.git.native(:clean, git_options.merge(:d => true, :q => true, :f => true))
       reload!
     end
 
@@ -149,20 +154,20 @@ module Gitolite
     # will also stage all changes then commit
     def save(commit_message = DEFAULT_COMMIT_MSG, options = {})
 
-      #Process config file (if loaded, i.e. may be modified)
+      # Process config file (if loaded, i.e. may be modified)
       if @config
         new_conf = @config.to_file(@conf_dir_path)
-        @gl_admin.git.native(:add, @git_options, new_conf)
+        @gl_admin.git.native(:add, git_options, new_conf)
       end
 
-      #Process ssh keys (if loaded, i.e. may be modified)
+      # Process ssh keys (if loaded, i.e. may be modified)
       if @ssh_keys
         files = list_keys.map{|f| File.basename f}
         keys  = @ssh_keys.values.map{|f| f.map {|t| t.filename}}.flatten
 
         to_remove = (files - keys).map { |f| File.join(@key_dir, f) }
         to_remove.each do |key|
-          @gl_admin.git.native(:rm, @git_options, key)
+          @gl_admin.git.native(:rm, git_options, key)
         end
 
         @ssh_keys.each_value do |key|
@@ -170,7 +175,7 @@ module Gitolite
           next if key.respond_to?(:dirty?) && !key.dirty?
           key.each do |k|
             new_key = k.to_file(@key_dir_path)
-            @gl_admin.git.native(:add, @git_options, new_key)
+            @gl_admin.git.native(:add, git_options, new_key)
           end
         end
       end
@@ -185,13 +190,13 @@ module Gitolite
         args << "--author='#{options[:author]}'"
       end
 
-      @gl_admin.git.native(:commit, @git_options, *args)
+      @gl_admin.git.native(:commit, git_options, *args)
     end
 
 
     # Push back to origin
     def apply
-      @gl_admin.git.native(:push, @git_options, "origin", "master")
+      @gl_admin.git.native(:push, git_options, "origin", "master")
     end
 
 
@@ -208,7 +213,7 @@ module Gitolite
 
       reset! if options[:reset]
 
-      @gl_admin.git.native(:pull, @git_options.merge(:rebase => options[:rebase]), "origin", "master")
+      @gl_admin.git.native(:pull, git_options.merge(:rebase => options[:rebase]), "origin", "master")
 
       reload!
     end

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Nicolas Rodriguez