Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
vimagit
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
jreybert
vimagit
Commits
6f86387f
Commit
6f86387f
authored
Dec 20, 2015
by
Jerome Reybert
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into next
* master: plugin/magit.vim: suppress more 'line added' messages
parents
e856b6a4
c5e02fb9
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugin/magit.vim
+10
-10
10 additions, 10 deletions
plugin/magit.vim
with
10 additions
and
10 deletions
plugin/magit.vim
+
10
−
10
View file @
6f86387f
...
...
@@ -146,7 +146,7 @@ function! s:mg_display_files(mode, curdir, depth)
if
(
file
.
depth
!=
a:depth
||
filename
!~
a:curdir
.
'.*'
)
continue
endif
put
=
file
.
get_filename_header
()
silent
put
=
file
.
get_filename_header
()
if
(
file
.
dir
!=
0
)
if
(
file
.
visible
==
1
)
...
...
@@ -156,7 +156,7 @@ function! s:mg_display_files(mode, curdir, depth)
endif
if
(
file
.
visible
==
0
)
put
=
''
silent
put
=
''
continue
endif
if
(
file
.
exists
==
0
)
...
...
@@ -171,7 +171,7 @@ function! s:mg_display_files(mode, curdir, depth)
silent
put
=
hunk
.
lines
endif
endfor
put
=
''
silent
put
=
''
endfor
endfunction
...
...
@@ -181,11 +181,11 @@ endfunction
" protected functions like magit#update_buffer
" param[in] mode: 'staged' or 'unstaged'
function
!
s:mg_get_staged_section
(
mode
)
put
=
''
put
=
g:magit_sections
[
a:mode
]
silent
put
=
''
silent
put
=
g:magit_sections
[
a:mode
]
call
<
SID
>
mg_section_help
(
a:mode
)
put
=
magit#utils#
underline
(
g:magit_sections
[
a:mode
])
put
=
''
silent
put
=
magit#utils#
underline
(
g:magit_sections
[
a:mode
])
silent
put
=
''
call
s:mg_display_files
(
a:mode
,
''
,
0
)
endfunction
...
...
@@ -206,7 +206,7 @@ function! s:mg_get_stashes()
for
stash
in
stash_list
let
stash_id
=
substitute
(
stash
,
'^\(stash@{\d\+}\):.*$'
,
'\1'
,
''
)
put
=
stash
silent
put
=
stash
silent
!
execute
"read !git stash show -p "
.
stash_id
endfor
endif
...
...
@@ -238,9 +238,9 @@ function! s:mg_get_commit_section()
if
(
filereadable
(
git_dir
.
'COMMIT_EDITMSG'
)
)
let
comment_char
=<
SID
>
mg_comment_char
()
let
commit_msg
=
magit#utils#join_list
(
filter
(
readfile
(
git_dir
.
'COMMIT_EDITMSG'
),
'v:val !~ "^'
.
comment_char
.
'"'
))
put
=
commit_msg
silent
put
=
commit_msg
endif
put
=
g:magit_sections
.
commit_end
silent
put
=
g:magit_sections
.
commit_end
endif
endfunction
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment