X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=8431837f9705d9a940819db4fcd51283f433ba1a;hb=08e7239c36a477c52ac83488537600a494002b31;hp=0a3092f646872867b0060d79c0fd1c85a40e24f4;hpb=f474c526618d5d1111b585a6344e012fb731d3fe;p=git.git diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0a3092f64..8431837f9 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1005,7 +1005,7 @@ _git_log () local cur="${COMP_WORDS[COMP_CWORD]}" local g="$(git rev-parse --git-dir 2>/dev/null)" local merge="" - if [ -f $g/MERGE_HEAD ]; then + if [ -f "$g/MERGE_HEAD" ]; then merge="--merge" fi case "$cur" in @@ -1843,7 +1843,7 @@ _gitk () local cur="${COMP_WORDS[COMP_CWORD]}" local g="$(git rev-parse --git-dir 2>/dev/null)" local merge="" - if [ -f $g/MERGE_HEAD ]; then + if [ -f "$g/MERGE_HEAD" ]; then merge="--merge" fi case "$cur" in