Mirror/git_stats
1
0
Fork 0
mirror of https://github.com/tomgi/git_stats.git synced 2024-12-22 13:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #70 from nspring/git-no-rename

Browse source 
use --no-rename to ensure consistent behavior for shortspec on renamed files
This commit is contained in:
Tomasz Gieniusz 2016-11-28 10:31:00 +01:00 committed by GitHub
commit 4c28474128
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/git_stats/git_data/commit.rb
View file

@ -41,7 +41,7 @@ module GitStats
end end
def lines_count def lines_count
@lines_count ||= repo.run("git diff --shortstat `git hash-object -t tree /dev/null` #{self.sha} -- #{repo.tree_path}").lines.map do |line| @lines_count ||= repo.run("git diff --shortstat --no-renames `git hash-object -t tree /dev/null` #{self.sha} -- #{repo.tree_path}").lines.map do |line|
line[/(\d+) insertions?/, 1].to_i line[/(\d+) insertions?/, 1].to_i
end.sum end.sum
end end

2
lib/git_stats/git_data/short_stat.rb
View file

@ -19,7 +19,7 @@ module GitStats
private private
def calculate_stat def calculate_stat
stat_line = commit.repo.run("git show --shortstat --oneline #{commit.sha} -- #{commit.repo.tree_path}").lines.to_a[1] stat_line = commit.repo.run("git show --shortstat --oneline --no-renames #{commit.sha} -- #{commit.repo.tree_path}").lines.to_a[1]
if stat_line.blank? if stat_line.blank?
@files_changed = @insertions = @deletions = 0 @files_changed = @insertions = @deletions = 0
else else

2
spec/git_data/short_stat_spec.rb
View file

@ -14,7 +14,7 @@ describe GitStats::GitData::ShortStat do
{content: '', expect: [0, 0, 0]}, {content: '', expect: [0, 0, 0]},
].each do |test| ].each do |test|
it "#{test[:content]} parsing" do it "#{test[:content]} parsing" do
commit.repo.should_receive(:run).with("git show --shortstat --oneline abc -- .").and_return("abc some commit\n#{test[:content]}") commit.repo.should_receive(:run).with("git show --shortstat --oneline --no-renames abc -- .").and_return("abc some commit\n#{test[:content]}")
commit.short_stat.should be_a(GitStats::GitData::ShortStat) commit.short_stat.should be_a(GitStats::GitData::ShortStat)