Skip to content

Commit cd38b2b

Browse files
authored
Merge pull request #165 from VariantSync/fix-total-commit-count
Fix the total commit count
2 parents 7678170 + cbca215 commit cd38b2b

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/main/java/org/variantsync/diffdetective/analysis/Analysis.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ public static AnalysisResult forSingleCommit(final String commitHash, final Anal
325325

326326
final double runtime = clock.getPassedSeconds();
327327
Logger.info("<<< done in {}", Clock.printPassedSeconds(runtime));
328-
329-
result.get(TotalNumberOfCommitsResult.KEY).value++;
328+
329+
result.get(TotalNumberOfCommitsResult.KEY).value = 1;
330330

331331
exportMetadata(analysis.getOutputDir(), result);
332332
return result;
@@ -448,7 +448,7 @@ public static AnalysisResult forEachCommit(
448448
Logger.info("<<< done in {}", Clock.printPassedSeconds(runtime));
449449

450450
analysis.getResult().get(RuntimeWithMultithreadingResult.KEY).value = runtime;
451-
// analysis.getResult().get(TotalNumberOfCommitsResult.KEY).value = numberOfTotalCommits.invocationCount().get();
451+
analysis.getResult().get(TotalNumberOfCommitsResult.KEY).value = numberOfTotalCommits.invocationCount().get();
452452

453453
exportMetadata(analysis.getOutputDir(), analysis.getResult());
454454
return analysis.getResult();
@@ -561,8 +561,6 @@ protected void processCommit() throws Exception {
561561
runReverseHook(patchHook, Hooks::endPatch);
562562
}
563563
}
564-
565-
getResult().get(TotalNumberOfCommitsResult.KEY).value++;
566564
}
567565

568566
protected void processPatch() throws Exception {

src/main/java/org/variantsync/diffdetective/analysis/StatisticsAnalysis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class StatisticsAnalysis implements Analysis.Hooks {
2121

2222
/**
2323
* Invariant:
24-
* {@link Result#emptyCommits} + {@link Result#failedCommits} + {@link Result#processedCommits} - {@link FilterAnalysis filteredCommits} = {@link Analysis.TotalNumberOfCommitsResult#value}
24+
* {@link Result#emptyCommits} + {@link Result#failedCommits} + {@link Result#processedCommits} + {@link org.variantsync.diffdetective.diff.git.GitDiffer filteredCommits} = {@link Analysis.TotalNumberOfCommitsResult#value totalCommits}
2525
*/
2626
public static final class Result implements Metadata<Result> {
2727
/**

0 commit comments

Comments
 (0)