From 2f6aadffa8243736825564cd1ce32d0d5a1eb391 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 29 Jul 2020 18:53:04 +0100 Subject: Git 2.28 no longer permits diff with ... on unrelated branches (#12364) * Git 2.28 no longer permits diff with ... on unrelated branches Signed-off-by: Andrew Thornton * need to check stderr --- services/gitdiff/gitdiff.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services') diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 09a826500b..85354784d4 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -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 } -- cgit v1.2.3