summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwhited <jwhited0917@gmail.com>2015-07-06 12:38:26 -0700
committerjwhited <jwhited0917@gmail.com>2015-07-06 12:38:26 -0700
commita880f2a3cbabff9561aa0e99c3eca6e33775916d (patch)
tree22f5cde19e3b5ba6d7507d17fa4f6db3711aada1
parent215cc4074083a65ebd9d3189532073882afd75e3 (diff)
fix fetch for groups when single_repo: true
-rw-r--r--lib/oxidized/output/git.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index 2678e3a..b1212f1 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -50,17 +50,13 @@ class Git < Output
def fetch node, group
begin
repo = @cfg.repo
- if (group && !@cfg.single_repo?)
- repo = File.join File.dirname(repo), group + '.git'
- end
+ repo = File.join File.dirname(repo), group + '.git' if group and not @cfg.single_repo?
repo = Rugged::Repository.new repo
index = repo.index
index.read_tree repo.head.target.tree unless repo.empty?
- if (group && @cfg.single_repo?)
- repo.read(index.get(group + '/' + node)[:oid]).data
- else
- repo.read(index.get(node)[:oid]).data
- end
+ file = node
+ file = File.join(group, node) if group and @cfg.single_repo?
+ repo.read(index.get(file)[:oid]).data
rescue
'node not found'
end