Skip to content

Fix CSV diff panic if the file was deleted from both branches #22947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix CSV diff panic if the file was deleted from both branches #22947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion services/gitdiff/csv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,12 @@ func CreateCsvDiff(diffFile *DiffFile, baseReader, headReader *csv.Reader) ([]*T

if baseReader != nil {
return createCsvDiffSingle(baseReader, TableDiffCellDel)
} else if headReader != nil {
return createCsvDiffSingle(headReader, TableDiffCellAdd)
}
return createCsvDiffSingle(headReader, TableDiffCellAdd)
// If a CSV file was deleted from both branches, then baseReader and headReader are nil, no need to "diff" them
// The UI will show a "deleted" change correctly.
return nil, nil
}

// createCsvDiffSingle creates a tabular diff based on a single CSV reader. All cells are added or deleted.
Expand Down