Skip to content

Commit

Permalink
Merge branch 'tr/bash-read-unescaped'
Browse files Browse the repository at this point in the history
* tr/bash-read-unescaped:
  bash completion: use read -r everywhere
  • Loading branch information
Junio C Hamano committed Dec 22, 2011
2 parents 3572668 + 6f2dd72 commit 2b6dd6a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ __git_ps1_show_upstream ()

# get some config options from git-config
local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
while read key value; do
while read -r key value; do
case "$key" in
bash.showupstream)
GIT_PS1_SHOWUPSTREAM="$value"
Expand Down Expand Up @@ -589,7 +589,7 @@ __git_refs ()
local ref entry
git --git-dir="$dir" for-each-ref --shell --format="ref=%(refname:short)" \
"refs/remotes/" | \
while read entry; do
while read -r entry; do
eval "$entry"
ref="${ref#*/}"
if [[ "$ref" == "$cur"* ]]; then
Expand All @@ -602,7 +602,7 @@ __git_refs ()
case "$cur" in
refs|refs/*)
git ls-remote "$dir" "$cur*" 2>/dev/null | \
while read hash i; do
while read -r hash i; do
case "$i" in
*^{}) ;;
*) echo "$i" ;;
Expand All @@ -611,7 +611,7 @@ __git_refs ()
;;
*)
git ls-remote "$dir" HEAD ORIG_HEAD 'refs/tags/*' 'refs/heads/*' 'refs/remotes/*' 2>/dev/null | \
while read hash i; do
while read -r hash i; do
case "$i" in
*^{}) ;;
refs/*) echo "${i#refs/*/}" ;;
Expand All @@ -636,7 +636,7 @@ __git_refs_remotes ()
{
local i hash
git ls-remote "$1" 'refs/heads/*' 2>/dev/null | \
while read hash i; do
while read -r hash i; do
echo "$i:refs/remotes/$1/${i#refs/heads/}"
done
}
Expand Down Expand Up @@ -1863,7 +1863,7 @@ __git_config_get_set_variables ()
done

git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
while read line
while read -r line
do
case "$line" in
*.*=*)
Expand Down

0 comments on commit 2b6dd6a

Please sign in to comment.