aboutsummaryrefslogtreecommitdiffstats
path: root/services/gitdiff
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-05-26 06:58:07 +0100
committerGitHub <noreply@github.com>2020-05-26 01:58:07 -0400
commit5cb201dc93bf41556556f2154ea28755907fd550 (patch)
treeeefbd70bb80a2b2204a18b776f9d0198855e087b /services/gitdiff
parentb97917a6e7b7a7852d1c0f39a96e06eeb7aab6de (diff)
downloadgitea-5cb201dc93bf41556556f2154ea28755907fd550.tar.gz
gitea-5cb201dc93bf41556556f2154ea28755907fd550.zip
Fix numbr of files, total additions, and deletions (#11614)
Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'services/gitdiff')
-rw-r--r--services/gitdiff/gitdiff.go18
1 files changed, 9 insertions, 9 deletions
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 6867f8e0a4..af88ed4d40 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -367,9 +367,9 @@ func getCommitFileLineCount(commit *git.Commit, filePath string) int {
// Diff represents a difference between two git trees.
type Diff struct {
- TotalAddition, TotalDeletion int
- Files []*DiffFile
- IsIncomplete bool
+ NumFiles, TotalAddition, TotalDeletion int
+ Files []*DiffFile
+ IsIncomplete bool
}
// LoadComments loads comments into each line
@@ -398,11 +398,6 @@ func (diff *Diff) LoadComments(issue *models.Issue, currentUser *models.User) er
return nil
}
-// NumFiles returns number of files changes in a diff.
-func (diff *Diff) NumFiles() int {
- return len(diff.Files)
-}
-
const cmdDiffHead = "diff --git "
// ParsePatch builds a Diff object from a io.Reader and some
@@ -639,7 +634,7 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D
}
}
}
-
+ diff.NumFiles = len(diff.Files)
return diff, nil
}
@@ -716,6 +711,11 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID
return nil, fmt.Errorf("Wait: %v", err)
}
+ diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, beforeCommitID+"..."+afterCommitID)
+ if err != nil {
+ return nil, err
+ }
+
return diff, nil
}