Remove redundant "dir" keys from dictionaries

This commit is contained in:
Tim Pope
2022-05-11 00:04:28 -04:00
parent b81c59bd6a
commit af8b352dbf

View File

@@ -609,8 +609,6 @@ function! fugitive#PrepareDirEnvGitFlagsArgs(...) abort
if type(cmd[i]) == type({}) if type(cmd[i]) == type({})
if has_key(cmd[i], 'git_dir') if has_key(cmd[i], 'git_dir')
let dir = cmd[i].git_dir let dir = cmd[i].git_dir
elseif has_key(cmd[i], 'dir')
let dir = cmd[i].dir
endif endif
if has_key(cmd[i], 'git') if has_key(cmd[i], 'git')
let git = cmd[i].git let git = cmd[i].git
@@ -3741,7 +3739,6 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
\ 'git': options.git, \ 'git': options.git,
\ 'flags': flags, \ 'flags': flags,
\ 'args': args, \ 'args': args,
\ 'dir': options.git_dir,
\ 'git_dir': options.git_dir, \ 'git_dir': options.git_dir,
\ 'cwd': s:UserCommandCwd(dir), \ 'cwd': s:UserCommandCwd(dir),
\ 'filetype': 'git', \ 'filetype': 'git',
@@ -5712,7 +5709,6 @@ function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
\ 'git': a:options.git, \ 'git': a:options.git,
\ 'flags': a:options.flags, \ 'flags': a:options.flags,
\ 'args': cmd + args, \ 'args': cmd + args,
\ 'dir': s:GitDir(a:options),
\ 'git_dir': s:GitDir(a:options), \ 'git_dir': s:GitDir(a:options),
\ 'cwd': s:UserCommandCwd(a:options), \ 'cwd': s:UserCommandCwd(a:options),
\ 'filetype': 'git', \ 'filetype': 'git',
@@ -6883,7 +6879,6 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
\ 'git': a:options.git, \ 'git': a:options.git,
\ 'flags': a:options.flags, \ 'flags': a:options.flags,
\ 'args': [a:options.subcommand] + a:options.subcommand_args, \ 'args': [a:options.subcommand] + a:options.subcommand_args,
\ 'dir': dir,
\ 'git_dir': dir, \ 'git_dir': dir,
\ 'cwd': s:UserCommandCwd(dir), \ 'cwd': s:UserCommandCwd(dir),
\ 'filetype': (raw ? 'git' : 'fugitiveblame'), \ 'filetype': (raw ? 'git' : 'fugitiveblame'),