Skip to content

Commit 072b405

Browse files
committed
Don't force line to be seen as modified if file was renamed, use the diff data
1 parent 4a3e67d commit 072b405

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

docs/changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v0.74.6
4+
5+
### Fixed
6+
7+
- Fixed a bug in GitLab integration causing some problems fail to create comments when files were renamed and modified.
8+
39
## v0.74.5
410

511
### Fixed

internal/reporter/gitlab.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -446,15 +446,11 @@ func reportToGitLabDiscussion(pending PendingComment, diffs []*gitlab.MergeReque
446446
},
447447
}
448448

449-
var renamed bool
450449
for _, diff := range pathDiffs {
451450
d.Position.OldPath = gitlab.Ptr(diff.OldPath)
452451
if d.Position.NewPath == nil {
453452
d.Position.NewPath = gitlab.Ptr(diff.NewPath)
454453
}
455-
if diff.OldPath != diff.NewPath {
456-
renamed = true
457-
}
458454

459455
// Diff is empty, decide if it was modified based on git history.
460456
if diff.Diff == "" {
@@ -492,9 +488,6 @@ func reportToGitLabDiscussion(pending PendingComment, diffs []*gitlab.MergeReque
492488
d.Position.NewLine = gitlab.Ptr(dl.new)
493489
}
494490
}
495-
if renamed {
496-
d.Position.OldLine = nil
497-
}
498491

499492
return &d
500493
}

0 commit comments

Comments
 (0)