Skip to content
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

Fix parsing of mode lines with trailing space #38

Merged
merged 1 commit into from
Dec 26, 2022
Merged

Fix parsing of mode lines with trailing space #38

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions gitdiff/file_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,12 +324,12 @@ func parseGitHeaderNewName(f *File, line, defaultName string) error {
}

func parseGitHeaderOldMode(f *File, line, defaultName string) (err error) {
f.OldMode, err = parseMode(line)
f.OldMode, err = parseMode(strings.TrimSpace(line))
return
}

func parseGitHeaderNewMode(f *File, line, defaultName string) (err error) {
f.NewMode, err = parseMode(line)
f.NewMode, err = parseMode(strings.TrimSpace(line))
return
}

Expand Down
21 changes: 21 additions & 0 deletions gitdiff/file_header_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,12 @@ func TestParseGitHeaderData(t *testing.T) {
OldMode: os.FileMode(0100644),
},
},
"oldModeWithTrailingSpace": {
Line: "old mode 100644\r\n",
OutputFile: &File{
OldMode: os.FileMode(0100644),
},
},
"invalidOldMode": {
Line: "old mode rw\n",
Err: true,
Expand All @@ -496,6 +502,12 @@ func TestParseGitHeaderData(t *testing.T) {
NewMode: os.FileMode(0100755),
},
},
"newModeWithTrailingSpace": {
Line: "new mode 100755\r\n",
OutputFile: &File{
NewMode: os.FileMode(0100755),
},
},
"invalidNewMode": {
Line: "new mode rwx\n",
Err: true,
Expand All @@ -518,6 +530,15 @@ func TestParseGitHeaderData(t *testing.T) {
IsNew: true,
},
},
"newFileModeWithTrailingSpace": {
Line: "new file mode 100755\r\n",
DefaultName: "dir/file.txt",
OutputFile: &File{
NewName: "dir/file.txt",
NewMode: os.FileMode(0100755),
IsNew: true,
},
},
"copyFrom": {
Line: "copy from dir/file.txt\n",
OutputFile: &File{
Expand Down