Skip to content

Commit 1486274

Browse files
committed
Fix git diff file header clear pattern
1 parent 2d491c5 commit 1486274

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

autoload/project/git.vim

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,8 @@ function! s:AddDiffDetails(hash, file)
155155

156156
setlocal modifiable
157157
call append(0, changes)
158+
call s:ClearDiffHeaders()
158159
normal! gg
159-
call project#RemoveEmptyLines()
160-
silent! g/^new file mode/d _
161-
if is_diff_line
162-
silent! 1,3d _
163-
else
164-
silent! 1,4d _
165-
endif
166160
setlocal nomodifiable
167161
endfunction
168162

@@ -504,6 +498,15 @@ function! s:RunJob(cmd, exit_cb, buf_nr)
504498
endif
505499
endfunction
506500

501+
function! s:ClearDiffHeaders()
502+
call project#RemoveEmptyLines()
503+
silent! 1,g/^new file mode/d _ | break
504+
silent! 1,g/^diff --git/d _ | break
505+
silent! 1,g/^index /d _ | break
506+
silent! 1,g/^--- /d _ | break
507+
silent! 1,g/^+++ /d _ | break
508+
endfunction
509+
507510
function! VimProjectAddChangeDetails(job, data, ...)
508511
let error = s:SwitchBuffer(s:diff_buffer)
509512
if error
@@ -518,12 +521,7 @@ function! VimProjectAddChangeDetails(job, data, ...)
518521
call append(0, a:data)
519522
endif
520523

521-
call project#RemoveEmptyLines()
522-
silent! 1,g/^new file mode/d _ | break
523-
silent! 1,g/^diff --git/d _ | break
524-
silent! 1,g/^index /d _ | break
525-
silent! 1,g/^--- a/d _ | break
526-
silent! 1,g/^+++ b/d _ | break
524+
call s:ClearDiffHeaders()
527525
normal! gg
528526
setlocal nomodifiable
529527
call s:SwitchBuffer(s:changelist_buffer)

0 commit comments

Comments
 (0)