jbox-gitolite 1.2.4 → 1.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b4253d62c4de6da94cf98aaf8256530f1220ed4b
4
- data.tar.gz: d49c94d508240a776dd40e7a340689c619312efa
3
+ metadata.gz: d0ce6bd59ddf8882ee481926b27c2cced1b6230a
4
+ data.tar.gz: d899933df8b5c6b4d2427f1822f6b27e59ee74d8
5
5
  SHA512:
6
- metadata.gz: 7e245a4c9dfdc7555c34456f80b0603aa1c20df05ec822e4809a782f2a4a000f23622d6348cca1e9c374067cbe6bc67d462af6ec7d151aff7847fb0d81ce589e
7
- data.tar.gz: 67e90dbb7cd7834c1c287555eeecfcf39c60689ee76f60cd899946b929e43554bf7fb88b2b494091bce330b39fe54d1eb7770eec5f3e78e8440309c5726d729d
6
+ metadata.gz: 6946a29f15c4b7cbeb6ca73e03fa840e7620d2a9d9eb6799227906411a03dfbd9a7c3be75d562958106d49e5cec8484331062a7409d01764eccf5eaf7f727712
7
+ data.tar.gz: 9ab24f2034fb783dabdd0896c26de20f2aa3c6e2367e445b9353bc5b23ba4f80e457e84c3ad5283119e4ad0231ea952b02423a02d5989a2ea12728d5ef7de947
@@ -100,6 +100,11 @@ module Gitolite
100
100
  end
101
101
 
102
102
 
103
+ def git_options
104
+ @git_options.clone
105
+ end
106
+
107
+
103
108
  def config
104
109
  @config ||= load_config
105
110
  end
@@ -131,8 +136,8 @@ module Gitolite
131
136
  # git repo to HEAD and reloading the entire repository
132
137
  # Note that this will also delete all untracked files
133
138
  def reset!
134
- @gl_admin.git.native(:reset, @git_options.merge(:hard => true), 'HEAD')
135
- @gl_admin.git.native(:clean, @git_options.merge(:d => true, :q => true, :f => true))
139
+ @gl_admin.git.native(:reset, git_options.merge(:hard => true), 'HEAD')
140
+ @gl_admin.git.native(:clean, git_options.merge(:d => true, :q => true, :f => true))
136
141
  reload!
137
142
  end
138
143
 
@@ -149,20 +154,20 @@ module Gitolite
149
154
  # will also stage all changes then commit
150
155
  def save(commit_message = DEFAULT_COMMIT_MSG, options = {})
151
156
 
152
- #Process config file (if loaded, i.e. may be modified)
157
+ # Process config file (if loaded, i.e. may be modified)
153
158
  if @config
154
159
  new_conf = @config.to_file(@conf_dir_path)
155
- @gl_admin.git.native(:add, @git_options, new_conf)
160
+ @gl_admin.git.native(:add, git_options, new_conf)
156
161
  end
157
162
 
158
- #Process ssh keys (if loaded, i.e. may be modified)
163
+ # Process ssh keys (if loaded, i.e. may be modified)
159
164
  if @ssh_keys
160
165
  files = list_keys.map{|f| File.basename f}
161
166
  keys = @ssh_keys.values.map{|f| f.map {|t| t.filename}}.flatten
162
167
 
163
168
  to_remove = (files - keys).map { |f| File.join(@key_dir, f) }
164
169
  to_remove.each do |key|
165
- @gl_admin.git.native(:rm, @git_options, key)
170
+ @gl_admin.git.native(:rm, git_options, key)
166
171
  end
167
172
 
168
173
  @ssh_keys.each_value do |key|
@@ -170,7 +175,7 @@ module Gitolite
170
175
  next if key.respond_to?(:dirty?) && !key.dirty?
171
176
  key.each do |k|
172
177
  new_key = k.to_file(@key_dir_path)
173
- @gl_admin.git.native(:add, @git_options, new_key)
178
+ @gl_admin.git.native(:add, git_options, new_key)
174
179
  end
175
180
  end
176
181
  end
@@ -185,13 +190,13 @@ module Gitolite
185
190
  args << "--author='#{options[:author]}'"
186
191
  end
187
192
 
188
- @gl_admin.git.native(:commit, @git_options, *args)
193
+ @gl_admin.git.native(:commit, git_options, *args)
189
194
  end
190
195
 
191
196
 
192
197
  # Push back to origin
193
198
  def apply
194
- @gl_admin.git.native(:push, @git_options, "origin", "master")
199
+ @gl_admin.git.native(:push, git_options, "origin", "master")
195
200
  end
196
201
 
197
202
 
@@ -208,7 +213,7 @@ module Gitolite
208
213
 
209
214
  reset! if options[:reset]
210
215
 
211
- @gl_admin.git.native(:pull, @git_options.merge(:rebase => options[:rebase]), "origin", "master")
216
+ @gl_admin.git.native(:pull, git_options.merge(:rebase => options[:rebase]), "origin", "master")
212
217
 
213
218
  reload!
214
219
  end
@@ -1,3 +1,3 @@
1
1
  module Gitolite
2
- VERSION = "1.2.4"
2
+ VERSION = "1.2.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jbox-gitolite
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.4
4
+ version: 1.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicolas Rodriguez