Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-13 23:04:52 +02:00
Code Issues Activity

Git 2.28 no longer permits diff with ... on unrelated branches (#12364)

Browse Source 
* Git 2.28 no longer permits diff with ... on unrelated branches

Signed-off-by: Andrew Thornton <art27@cantab.net>

* need to check stderr
This commit is contained in:
zeripath authored and GitHub committed 2020-07-29 13:53:04 -04:00
1 parent f2a6cd6401
commit 2f6aadffa8
5 files changed
+68 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/gitdiff/gitdiff.go
+6
View File
@@ -752,6 +752,12 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID
shortstatArgs = []string{git.EmptyTreeSHA, afterCommitID}
}
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
if err != nil && strings.Contains(err.Error(), "no merge base") {
// git >= 2.28 now returns an error if base and head have become unrelated.
// previously it would return the results of git diff --shortstat base head so let's try that...
shortstatArgs = []string{beforeCommitID, afterCommitID}
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
}
if err != nil {
return nil, err
}