Class: Grit::GitRuby::Repository

Inherits:
Object
  • Object
show all
Defined in:
lib/grit/git-ruby/repository.rb

Defined Under Namespace

Classes: NoSuchPath, NoSuchShaFound

Instance Attribute Summary collapse

Class Method Summary collapse

Instance Method Summary collapse

Constructor Details

#initialize(git_dir, options = {}) ⇒ Repository

Returns a new instance of Repository.



37
38
39
40
41
 
# File 'lib/grit/git-ruby/repository.rb', line 37

def initialize(git_dir, options = {})
  @git_dir = git_dir
  @options = options
  @packs = []
end

Instance Attribute Details

#git_dir ⇒ Object

Returns the value of attribute git_dir.



35
36
37
 
# File 'lib/grit/git-ruby/repository.rb', line 35

def git_dir
  @git_dir
end

#options ⇒ Object

Returns the value of attribute options.



35
36
37
 
# File 'lib/grit/git-ruby/repository.rb', line 35

def options
  @options
end

Class Method Details

.add_file(name, contents) ⇒ Object 



685
686
687
688
689
690
691
 
# File 'lib/grit/git-ruby/repository.rb', line 685

def self.add_file(name, contents)
  path = File.join(Dir.pwd, name)
  raise "Invalid path: #{path}" unless File.absolute_path(path) == path
  File.open(path, 'w') do |f|
    f.write contents
  end
end

.create_initial_config(bare = false) ⇒ Object 



679
680
681
682
683
 
# File 'lib/grit/git-ruby/repository.rb', line 679

def self.create_initial_config(bare = false)
  bare ? bare_status = 'true' : bare_status = 'false'
  config = "[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = #{bare_status}\n\tlogallrefupdates = true"
  add_file('config', config)
end

.init(dir, bare = true) ⇒ Object

initialize a git repository



645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
 
# File 'lib/grit/git-ruby/repository.rb', line 645

def self.init(dir, bare = true)

  FileUtils.mkdir_p(dir) if !File.exists?(dir)

  FileUtils.cd(dir) do
    if(File.exists?('objects'))
      return false # already initialized
    else
      # initialize directory
      create_initial_config(bare)
      FileUtils.mkdir_p('refs/heads')
      FileUtils.mkdir_p('refs/tags')
      FileUtils.mkdir_p('objects/info')
      FileUtils.mkdir_p('objects/pack')
      FileUtils.mkdir_p('branches')
      add_file('description', 'Unnamed repository; edit this file to name it for gitweb.')
      add_file('HEAD', "ref: refs/heads/master\n")
      FileUtils.mkdir_p('hooks')
      FileUtils.cd('hooks') do
        add_file('applypatch-msg', '# add shell script and make executable to enable')
        add_file('post-commit', '# add shell script and make executable to enable')
        add_file('post-receive', '# add shell script and make executable to enable')
        add_file('post-update', '# add shell script and make executable to enable')
        add_file('pre-applypatch', '# add shell script and make executable to enable')
        add_file('pre-commit', '# add shell script and make executable to enable')
        add_file('pre-rebase', '# add shell script and make executable to enable')
        add_file('update', '# add shell script and make executable to enable')
      end
      FileUtils.mkdir_p('info')
      add_file('info/exclude', "# *.[oa]\n# *~")
    end
  end
end

Instance Method Details

#blame_tree(commit_sha, path) ⇒ Object 



576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
 
# File 'lib/grit/git-ruby/repository.rb', line 576

def blame_tree(commit_sha, path)
  # find subtree
  tree_sha = get_subtree(commit_sha, path)
  return {} if !tree_sha

  looking_for = []
  get_object_by_sha1(tree_sha).entry.each do |e|
    looking_for << File.join('.', e.name)
  end

  @already_searched = {}
  commits = look_for_commits(commit_sha, path, looking_for)

  # cleaning up array
  arr = {}
  commits.each do |commit_array|
    key = commit_array[0].gsub('./', '')
    arr[key] = commit_array[1]
  end
  arr
end

#cached(key, object, do_cache = true) ⇒ Object 



99
100
101
 
# File 'lib/grit/git-ruby/repository.rb', line 99

def cached(key, object, do_cache = true)
  object
end

#cat_file(sha) ⇒ Object

returns the raw file contents of this sha



154
155
156
 
# File 'lib/grit/git-ruby/repository.rb', line 154

def cat_file(sha)
  get_object_by_sha1(sha).raw_content
end

#cat_file_size(sha) ⇒ Object

returns the file size (as an int) of this sha



149
150
151
 
# File 'lib/grit/git-ruby/repository.rb', line 149

def cat_file_size(sha)
  get_raw_object_by_sha1(sha).content.size
end

#cat_file_type(sha) ⇒ Object

returns the file type (as a symbol) of this sha



144
145
146
 
# File 'lib/grit/git-ruby/repository.rb', line 144

def cat_file_type(sha)
  get_raw_object_by_sha1(sha).type
end

#close ⇒ Object 



693
694
695
696
697
 
# File 'lib/grit/git-ruby/repository.rb', line 693

def close
  @packs.each do |pack|
    pack.close
  end if @packs
end

#diff(commit1, commit2, options = {}) ⇒ Object 



395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
 
# File 'lib/grit/git-ruby/repository.rb', line 395

def diff(commit1, commit2, options = {})
  patch = ''

  commit_obj1 = get_object_by_sha1(commit1)
  tree1 = commit_obj1.tree
  if commit2
    tree2 = get_object_by_sha1(commit2).tree
  else
    tree2 = get_object_by_sha1(commit_obj1.parent.first).tree
  end

  qdiff = quick_diff(tree1, tree2)

  qdiff.sort.each do |diff_arr|
    path, status, treeSHA1, treeSHA2 = *diff_arr
    format, lines, output = :unified, 3, ''
    file_length_difference = 0

    fileA = treeSHA1 ? cat_file(treeSHA1) : ''
    fileB = treeSHA2 ? cat_file(treeSHA2) : ''

    sha1 = treeSHA1 || '0000000000000000000000000000000000000000'
    sha2 = treeSHA2 || '0000000000000000000000000000000000000000'

    data_old = fileA.split(/\n/).map! { |e| e.chomp }
    data_new = fileB.split(/\n/).map! { |e| e.chomp }

    diffs = Difference::LCS.diff(data_old, data_new)
    next if diffs.empty?

    a_path = "a/#{path.gsub('./', '')}"
    b_path = "b/#{path.gsub('./', '')}"

    header = "diff --git #{a_path} #{b_path}"
    if options[:full_index]
      header << "\n" + 'index ' + sha1 + '..' + sha2
      header << ' 100644' if treeSHA2 # hard coding this because i don't think we use it
    else
      header << "\n" + 'index ' + sha1[0,7] + '..' + sha2[0,7]
      header << ' 100644' if treeSHA2 # hard coding this because i don't think we use it
    end
    header << "\n--- " + (treeSHA1 ? a_path : '/dev/null')
    header << "\n+++ " + (treeSHA2 ? b_path : '/dev/null')
    header += "\n"

    oldhunk = hunk = nil

    diffs.each do |piece|
      begin
        hunk = Difference::LCS::Hunk.new(data_old, data_new, piece, lines, file_length_difference)
        file_length_difference = hunk.file_length_difference

        next unless oldhunk

        if lines > 0 && hunk.overlaps?(oldhunk)
          hunk.unshift(oldhunk)
        else
          output << oldhunk.diff(format)
        end
      ensure
        oldhunk = hunk
        output << "\n"
      end
    end

    output << oldhunk.diff(format)
    output << "\n"

    patch << header + output.lstrip
  end
  patch
rescue
  '' # one of the trees was bad or lcs isn't there - no diff
end

#files_changed?(tree_sha1, tree_sha2, path_limiter = nil) ⇒ Boolean

returns true if the files in path_limiter were changed, or no path limiter used by the log() function when passed with a path_limiter

Returns:

  • (Boolean) 


544
545
546
547
548
549
550
551
552
553
554
555
556
 
# File 'lib/grit/git-ruby/repository.rb', line 544

def files_changed?(tree_sha1, tree_sha2, path_limiter = nil)
  if path_limiter
    mod = quick_diff(tree_sha1, tree_sha2)
    files = mod.map { |c| c.first }
    path_limiter.to_a.each do |filepath|
      if files.include?(filepath)
        return true
      end
    end
    return false
  end
  true
end

#get_object_by_sha1(sha1) ⇒ Object

returns GitRuby object of any type given a SHA1



104
105
106
107
108
 
# File 'lib/grit/git-ruby/repository.rb', line 104

def get_object_by_sha1(sha1)
  r = get_raw_object_by_sha1(sha1)
  return nil if !r
  GitObject.from_raw(r)
end

#get_raw_object_by_sha1(sha1o) ⇒ Object

returns a raw object given a SHA1

Raises:



72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
 
# File 'lib/grit/git-ruby/repository.rb', line 72

def get_raw_object_by_sha1(sha1o)
  raise NoSuchShaFound if sha1o.nil? || sha1o.empty? || !sha1o.is_a?(String)

  sha1 = [sha1o.chomp].pack("H*")
  # try packs
  packs.each do |pack|
    o = pack[sha1]
    return pack[sha1] if o
  end

  # try loose storage
  loose.each do |lsobj|
    o = lsobj[sha1]
    return o if o
  end

  # try packs again, maybe the object got packed in the meantime
  initpacks
  packs.each do |pack|
    o = pack[sha1]
    return o if o
  end

#        puts "*#{sha1o}*"
  raise NoSuchShaFound
end

#get_raw_tree(sha, recursive = false) ⇒ Object 



186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
 
# File 'lib/grit/git-ruby/repository.rb', line 186

def get_raw_tree(sha, recursive = false)
  o = get_raw_object_by_sha1(sha)
  if o.type == :commit
    tree = get_object_by_sha1(sha).tree
  elsif o.type == :tag
    commit_sha = get_object_by_sha1(sha).object
    tree = get_object_by_sha1(commit_sha).tree
  elsif o.type == :tree
    tree = sha
  else
    return nil
  end

  recursive ? get_raw_trees(tree) : cat_file(tree)
end

#get_raw_trees(sha, path = '') ⇒ Object

Grabs tree contents recursively,

e.g. `git ls-tree -r sha`



204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
 
# File 'lib/grit/git-ruby/repository.rb', line 204

def get_raw_trees(sha, path = '')
  out = ''
  cat_file(sha).split("\n").each do |line|
    mode, type, sha, name = line.split(/\s/)

    if type == 'tree'
      full_name = path.empty? ? name : "#{path}/#{name}"
      out << get_raw_trees(sha, full_name)
    elsif path.empty?
      out << line + "\n"
    else
      out << line.gsub(name, "#{path}/#{name}") + "\n"
    end
  end

  out
end

#get_subtree(commit_sha, path) ⇒ Object 



558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
 
# File 'lib/grit/git-ruby/repository.rb', line 558

def get_subtree(commit_sha, path)
  tree_sha = get_object_by_sha1(commit_sha).tree

  if path && !(path == '' || path == '.' || path == './')
    paths = path.split('/')
    paths.each do |pathname|
      tree = get_object_by_sha1(tree_sha)
      if entry = tree.entry.select { |e| e.name == pathname }.first
        tree_sha = entry.sha1 rescue nil
      else
        return false
      end
    end
  end

  tree_sha
end

#in_loose?(sha_hex) ⇒ Boolean

returns true if the hex-packed sha is in the loose objects

Returns:

  • (Boolean) 


135
136
137
138
139
140
 
# File 'lib/grit/git-ruby/repository.rb', line 135

def in_loose?(sha_hex)
  loose.each do |lsobj|
    return true if lsobj[sha_hex]
  end
  false
end

#in_packs?(sha_hex) ⇒ Boolean

returns true if the hex-packed sha is in the packfiles

Returns:

  • (Boolean) 


126
127
128
129
130
131
132
 
# File 'lib/grit/git-ruby/repository.rb', line 126

def in_packs?(sha_hex)
  # try packs
  packs.each do |pack|
    return true if pack[sha_hex]
  end
  false
end

#list_tree(sha) ⇒ Object

returns a 2-d hash of the tree

‘blob’][‘FILENAME’

=> ‘100644’, :sha => SHA

‘tree’][‘DIRNAME’

=> ‘040000’, :sha => SHA



161
162
163
164
165
166
167
 
# File 'lib/grit/git-ruby/repository.rb', line 161

def list_tree(sha)
  data = {'blob' => {}, 'tree' => {}, 'link' => {}, 'commit' => {}}
  get_object_by_sha1(sha).entry.each do |e|
    data[e.format_type][e.name] = {:mode => e.format_mode, :sha => e.sha1}
  end
  data
end

#log(sha, options = {}) ⇒ Object

returns an array of GitRuby Commit objects

[sha, raw_output], [sha, raw_output], [sha, raw_output

… ]

takes the following options:

:since - Time object specifying that you don't want commits BEFORE this
:until - Time object specifying that you don't want commit AFTER this
:first_parent - tells log to only walk first parent
:path_limiter - string or array of strings to limit path
:max_count - number to limit the output



285
286
287
288
 
# File 'lib/grit/git-ruby/repository.rb', line 285

def log(sha, options = {})
  @already_searched = {}
  walk_log(sha, options)
end

#look_for_commits(commit_sha, path, looking_for, options = {}) ⇒ Object 



598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
 
# File 'lib/grit/git-ruby/repository.rb', line 598

def look_for_commits(commit_sha, path, looking_for, options = {})
  return [] if @already_searched[commit_sha] # to prevent rechecking branches

  @already_searched[commit_sha] = true

  commit = get_object_by_sha1(commit_sha)
  tree_sha = get_subtree(commit_sha, path)

  found_data = []

  # at the beginning of the branch
  if commit.parent.size == 0
    looking_for.each do |search|
      # prevents the rare case of multiple branch starting points with
      # files that have never changed
      if found_data.assoc(search)
        found_data << [search, commit_sha]
      end
    end
    return found_data
  end

  # go through the parents recursively, looking for somewhere this has been changed
  commit.parent.each do |pc|
    diff = quick_diff(tree_sha, get_subtree(pc, path), '.', false)

    # remove anything found
    looking_for.each do |search|
      if match = diff.assoc(search)
        found_data << [search, commit_sha, match]
        looking_for.delete(search)
      end
    end

    if looking_for.size <= 0  # we're done
      return found_data
    end

    found_data += look_for_commits(pc, path, looking_for)  # recurse into parent
    return found_data if options[:first_parent]
  end

  ## TODO : find most recent commit with change in any parent
  found_data
end

#loose ⇒ Object

returns the loose objects object lazily



44
45
46
 
# File 'lib/grit/git-ruby/repository.rb', line 44

def loose
  @loose ||= initloose
end

#ls_tree(sha, paths = [], recursive = false) ⇒ Object

returns the raw (cat-file) output for a tree if given a commit sha, it will print the tree of that commit if given a path limiter array, it will limit the output to those if asked for recrusive trees, will traverse trees



173
174
175
176
177
178
179
180
181
182
183
184
 
# File 'lib/grit/git-ruby/repository.rb', line 173

def ls_tree(sha, paths = [], recursive = false)
  if paths.size > 0
    # pathing
    part = []
    paths.each do |path|
      part += ls_tree_path(sha, path)
    end
    return part.join("\n")
  else
    get_raw_tree(sha, recursive)
  end
end

#ls_tree_path(sha, path, append = nil) ⇒ Object

return array of tree entries TODO : refactor this to remove the fugly



224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
 
# File 'lib/grit/git-ruby/repository.rb', line 224

def ls_tree_path(sha, path, append = nil)
  tree = get_raw_tree(sha)
  if path =~ /\//
    paths = path.split('/')
    last = path[path.size - 1, 1]
    if (last == '/') && (paths.size == 1)
      append = append ? File.join(append, paths.first) : paths.first
      dir_name = tree.split("\n").select { |p| p.split("\t")[1] == paths.first }.first
      raise NoSuchPath if !dir_name
      next_sha = dir_name.split(' ')[2]
      tree = get_raw_tree(next_sha)
      tree = tree.split("\n")
      if append
        mod_tree = []
        tree.each do |ent|
          (info, fpath) = ent.split("\t")
          mod_tree << [info, File.join(append, fpath)].join("\t")
        end
        mod_tree
      else
        tree
      end
    else
      raise NoSuchPath if tree.nil?
      next_path = paths.shift
      dir_name = tree.split("\n").select { |p| p.split("\t")[1] == next_path }.first
      raise NoSuchPath if !dir_name
      next_sha = dir_name.split(' ')[2]
      next_path = append ? File.join(append, next_path) : next_path
      if (last == '/')
        ls_tree_path(next_sha, paths.join("/") + '/', next_path)
      else
        ls_tree_path(next_sha, paths.join("/"), next_path)
      end
    end
  else
    raise NoSuchPath if tree.nil?
    tree = tree.split("\n")
    tree = tree.select { |p| p.split("\t")[1] == path }
    if append
      mod_tree = []
      tree.each do |ent|
        (info, fpath) = ent.split("\t")
        mod_tree << [info, File.join(append, fpath)].join("\t")
      end
      mod_tree
    else
      tree
    end
  end
end

#object_exists?(sha1) ⇒ Boolean

returns true or false if that sha exists in the db

Returns:

  • (Boolean) 


116
117
118
119
120
121
122
123
 
# File 'lib/grit/git-ruby/repository.rb', line 116

def object_exists?(sha1)
  sha_hex = [sha1].pack("H*")
  return true if in_packs?(sha_hex)
  return true if in_loose?(sha_hex)
  initpacks
  return true if in_packs?(sha_hex) #maybe the object got packed in the meantime
  false
end

#packs ⇒ Object

returns the array of pack list objects



49
50
51
 
# File 'lib/grit/git-ruby/repository.rb', line 49

def packs
  @packs ||= initpacks
end

#put_raw_object(content, type) ⇒ Object

writes a raw object into the git repo



111
112
113
 
# File 'lib/grit/git-ruby/repository.rb', line 111

def put_raw_object(content, type)
  loose.first.put_raw_object(content, type)
end

#quick_diff(tree1, tree2, path = '.', recurse = true) ⇒ Object

takes 2 tree shas and recursively walks them to find out what files or directories have been modified in them and returns an array of changes [ [full_path, ‘added’, tree1_hash, nil],

 [full_path, 'removed', nil, tree2_hash],
 [full_path, 'modified', tree1_hash, tree2_hash]
]



499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
 
# File 'lib/grit/git-ruby/repository.rb', line 499

def quick_diff(tree1, tree2, path = '.', recurse = true)
  # handle empty trees
  return changed if tree1 == tree2

  t1 = list_tree(tree1) if tree1
  t2 = list_tree(tree2) if tree2

  # finding files that are different
  changed = quick_what_changed(t1, t2, path, 'blob') +
            quick_what_changed(t1, t2, path, 'link')

  t1['tree'].each do |dir, hsh|
    t2_tree = t2['tree'][dir] rescue nil
    full = File.join(path, dir)
    if !t2_tree
      if recurse
        changed += quick_diff(hsh[:sha], nil, full, true)
      else
        changed << [full, 'added', hsh[:sha], nil]      # not in parent
      end
    elsif (hsh[:sha] != t2_tree[:sha])
      if recurse
        changed += quick_diff(hsh[:sha], t2_tree[:sha], full, true)
      else
        changed << [full, 'modified', hsh[:sha], t2_tree[:sha]]   # file changed
      end
    end
  end if t1
  t2['tree'].each do |dir, hsh|
    t1_tree = t1['tree'][dir] rescue nil
    full = File.join(path, dir)
    if !t1_tree
      if recurse
        changed += quick_diff(nil, hsh[:sha], full, true)
      else
        changed << [full, 'removed', nil, hsh[:sha]]
      end
    end
  end if t2

  changed
end

#quick_what_changed(t1, t2, path, type) ⇒ Object 



470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
 
# File 'lib/grit/git-ruby/repository.rb', line 470

def quick_what_changed(t1, t2, path, type)
  changed = []

  t1[type].each do |file, hsh|
    t2_file = t2[type][file] rescue nil
    full = File.join(path, file)
    if !t2_file
      changed << [full, 'added', hsh[:sha], nil]      # not in parent
    elsif (hsh[:sha] != t2_file[:sha])
      changed << [full, 'modified', hsh[:sha], t2_file[:sha]]   # file changed
    end
  end if t1

  t2[type].each do |file, hsh|
    if !t1 || !t1[type][file]
      changed << [File.join(path, file), 'removed', nil, hsh[:sha]]
    end
  end if t2

  changed
end

#rev_list(sha, options) ⇒ Object 



301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
 
# File 'lib/grit/git-ruby/repository.rb', line 301

def rev_list(sha, options)
  if sha.is_a? Array
    (end_sha, sha) = sha
  end

  log = log(sha, options)
  log = log.sort { |a, b| a[2] <=> b[2] }.reverse

  if end_sha
    log = truncate_arr(log, end_sha)
  end

  # shorten the list if it's longer than max_count (had to get everything in branches)
  if options[:max_count]
    if (opt_len = options[:max_count].to_i) < log.size
      log = log[0, opt_len]
    end
  end

  if options[:pretty] == 'raw'
    log.map {|k, v| v }.join('')
  else
    log.map {|k, v| k }.join("\n")
  end
end

#show ⇒ Object

prints out the type, shas and content of all of the pack files



55
56
57
58
59
60
61
62
63
64
65
66
67
68
 
# File 'lib/grit/git-ruby/repository.rb', line 55

def show
  packs.each do |p|
    puts p.name
    puts
    p.each_sha1 do |s|
      puts "**#{p[s].type}**"
      if p[s].type.to_s == 'commit'
        puts s.unpack('H*')
        puts p[s].content
      end
    end
    puts
  end
end

#truncate_arr(arr, sha) ⇒ Object 



290
291
292
293
294
295
296
297
298
299
 
# File 'lib/grit/git-ruby/repository.rb', line 290

def truncate_arr(arr, sha)
  new_arr = []
  arr.each do |a|
    if a[0] == sha
      return new_arr
    end
    new_arr << a
  end
  return new_arr
end

#walk_log(sha, opts, total_size = 0) ⇒ Object

called by log() to recursively walk the tree



328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
 
# File 'lib/grit/git-ruby/repository.rb', line 328

def walk_log(sha, opts, total_size = 0)
  return [] if @already_searched[sha] # to prevent rechecking branches
  @already_searched[sha] = true

  array = []
  if (sha)
    o = get_raw_object_by_sha1(sha)
    if o.type == :tag
      commit_sha = get_object_by_sha1(sha).object
      c = get_object_by_sha1(commit_sha)
    else
      c = GitObject.from_raw(o)
    end

    return [] if c.type != :commit

    add_sha = true

    if opts[:since] && opts[:since].is_a?(Time) && (opts[:since] > c.committer.date)
      add_sha = false
    end
    if opts[:until] && opts[:until].is_a?(Time) && (opts[:until] < c.committer.date)
      add_sha = false
    end

    # follow all parents unless '--first-parent' is specified #
    subarray = []

    if !c.parent.first && opts[:path_limiter]  # check for the last commit
      add_sha = false
    end

    if (!opts[:max_count] || ((array.size + total_size) < opts[:max_count]))

      if !opts[:path_limiter]
        output = c.raw_log(sha)
        array << [sha, output, c.committer.date]
      end

      if (opts[:max_count] && (array.size + total_size) >= opts[:max_count])
        return array
      end

      c.parent.each do |psha|
        if psha && !files_changed?(c.tree, get_object_by_sha1(psha).tree,
                                  opts[:path_limiter])
          add_sha = false
        end
        subarray += walk_log(psha, opts, (array.size + total_size))
        next if opts[:first_parent]
      end

      if opts[:path_limiter] && add_sha
        output = c.raw_log(sha)
        array << [sha, output, c.committer.date]
      end

      if add_sha
        array += subarray
      end
    end

  end

  array
end