m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 13:23:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify conditional around :GBrowse line number computation

Browse Source 
This is solely to improve the readability of upcoming diffs.
This commit is contained in:
Tim Pope
2022-06-17 23:00:40 -04:00
parent bef885fd00
commit 763f42cab5
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
autoload/fugitive.vim
View File

@@ -7369,11 +7369,9 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abor
let line1 = a:count > 0 && type ==# 'blob' ? a:line1 : 0 let line1 = a:count > 0 && type ==# 'blob' ? a:line1 : 0
let line2 = a:count > 0 && type ==# 'blob' ? a:count : 0 let line2 = a:count > 0 && type ==# 'blob' ? a:count : 0
if empty(commit) && path !~# '^\.git/' if empty(commit) && path !~# '^\.git/'
if a:count < 0 && !empty(merge) if a:count < 0
let commit = merge let commit = merge
else elseif len(merge)
let commit = ''
if len(merge)
let owner = s:Owner(@%, dir) let owner = s:Owner(@%, dir)
let commit = s:ChompDefault('', ['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? '@' : owner, '--'], dir) let commit = s:ChompDefault('', ['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? '@' : owner, '--'], dir)
if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$' if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
@@ -7393,7 +7391,6 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abor
endif endif
endif endif
endif endif
endif
if empty(commit) if empty(commit)
let commit = readfile(fugitive#Find('.git/HEAD', dir), '', 1)[0] let commit = readfile(fugitive#Find('.git/HEAD', dir), '', 1)[0]
endif endif