Skip to content

Commit 11aa9e5

Browse files
committed
[#705] Change p4 diff options to allow detection of space changes
1 parent 3ab1e15 commit 11aa9e5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/vcs/p4/p4_impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (*p4Impl) UnStash(_ bool) error {
211211
// Diff returns the list of files modified since last commit with diff info for each file
212212
func (p *p4Impl) Diff() (diffs vcs.FileDiffs, err error) {
213213
var p4Output []byte
214-
p4Output, err = p.runP4("diff", "-f", "-Od", "-dw", "-ds", filepath.Join(p.baseDir, "/..."))
214+
p4Output, err = p.runP4("diff", "-f", "-Od", "-dl", "-ds", filepath.Join(p.baseDir, "/..."))
215215
if err != nil {
216216
return nil, err
217217
}

src/vcs/p4/p4_impl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func Test_p4_diff(t *testing.T) {
127127
"",
128128
nil,
129129
false,
130-
[]string{"diff", "-f", "-Od", "-dw", "-ds", filepath.Clean("/...")},
130+
[]string{"diff", "-f", "-Od", "-dl", "-ds", filepath.Clean("/...")},
131131
nil,
132132
},
133133
{"p4 diff command call fails",

0 commit comments

Comments
 (0)