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

Bugfix/705 adding removing space #707

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Bugfix/705 adding removing space #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ab1e15
[#705] Change git diff options to allow detection of space changes
mengdaming Jul 5, 2024
11aa9e5
[#705] Change p4 diff options to allow detection of space changes
mengdaming Jul 5, 2024
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
2 changes: 1 addition & 1 deletion src/vcs/git/git_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func (g *gitImpl) UnStash(keep bool) error {
func (g *gitImpl) Diff() (diffs vcs.FileDiffs, err error) {
var gitOutput []byte
gitOutput, err = g.runGit("diff", "--numstat", "--ignore-cr-at-eol",
"--ignore-all-space", "--ignore-blank-lines", "HEAD")
"--ignore-blank-lines", "HEAD")
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion src/vcs/git/git_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func Test_git_diff(t *testing.T) {
nil,
false,
[]string{
"diff", "--numstat", "--ignore-cr-at-eol", "--ignore-all-space", "--ignore-blank-lines", "HEAD"},
"diff", "--numstat", "--ignore-cr-at-eol", "--ignore-blank-lines", "HEAD"},
nil,
},
{"git diff command call fails",
Expand Down
2 changes: 1 addition & 1 deletion src/vcs/p4/p4_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func (*p4Impl) UnStash(_ bool) error {
// Diff returns the list of files modified since last commit with diff info for each file
func (p *p4Impl) Diff() (diffs vcs.FileDiffs, err error) {
var p4Output []byte
p4Output, err = p.runP4("diff", "-f", "-Od", "-dw", "-ds", filepath.Join(p.baseDir, "/..."))
p4Output, err = p.runP4("diff", "-f", "-Od", "-dl", "-ds", filepath.Join(p.baseDir, "/..."))
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion src/vcs/p4/p4_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func Test_p4_diff(t *testing.T) {
"",
nil,
false,
[]string{"diff", "-f", "-Od", "-dw", "-ds", filepath.Clean("/...")},
[]string{"diff", "-f", "-Od", "-dl", "-ds", filepath.Clean("/...")},
nil,
},
{"p4 diff command call fails",
Expand Down