Fix bash completion in path with spaces
Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Trivially-acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
67f1fe5f08
commit
ba7906f2f4
@ -939,7 +939,7 @@ _git_log ()
|
|||||||
local cur="${COMP_WORDS[COMP_CWORD]}"
|
local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||||
local g="$(git rev-parse --git-dir 2>/dev/null)"
|
local g="$(git rev-parse --git-dir 2>/dev/null)"
|
||||||
local merge=""
|
local merge=""
|
||||||
if [ -f $g/MERGE_HEAD ]; then
|
if [ -f "$g/MERGE_HEAD" ]; then
|
||||||
merge="--merge"
|
merge="--merge"
|
||||||
fi
|
fi
|
||||||
case "$cur" in
|
case "$cur" in
|
||||||
@ -1681,7 +1681,7 @@ _gitk ()
|
|||||||
local cur="${COMP_WORDS[COMP_CWORD]}"
|
local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||||
local g="$(git rev-parse --git-dir 2>/dev/null)"
|
local g="$(git rev-parse --git-dir 2>/dev/null)"
|
||||||
local merge=""
|
local merge=""
|
||||||
if [ -f $g/MERGE_HEAD ]; then
|
if [ -f "$g/MERGE_HEAD" ]; then
|
||||||
merge="--merge"
|
merge="--merge"
|
||||||
fi
|
fi
|
||||||
case "$cur" in
|
case "$cur" in
|
||||||
|
Loading…
Reference in New Issue
Block a user