bash completion: use read -r everywhere

We use the 'read' command without -r, so that it treats '\' as an
escape character, in several places.  This breaks the loop reading
refnames from git-for-each-ref in __git_refs() if there are refnames
such as "foo'bar", in which case for-each-ref helpfully quotes them as

$ git update-ref "refs/remotes/test/foo'bar" HEAD
$ git for-each-ref --shell --format="ref=%(refname:short)" "refs/remotes"
ref='test/foo'\''bar'

Interpolating the \' here will read "ref='test/foo'''bar'" instead, and
eval then chokes on the unbalanced quotes.

However, since none of the read loops _want_ to have backslashes
interpolated, it's much safer to use read -r everywhere.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cc1bdf960949cfeb977d8a188a2324b48bf5c6df..b0062bac22347e42dd64047c51dfb2bff92243ef 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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 ')"
 
        # 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"
                case "$key" in
                bash.showupstream)
                        GIT_PS1_SHOWUPSTREAM="$value"


@@ -589,7 +589,7 @@ __git_refs ()
                        local ref entry
                        git --git-dir="$dir" for-each-ref --shell --format="ref=%(refname:short)" \
                                "refs/remotes/" | \
                        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
                                eval "$entry"
                                ref="${ref#*/}"
                                if [[ "$ref" == "$cur"* ]]; then


@@ -602,7 +602,7 @@ __git_refs ()
        case "$cur" in
        refs|refs/*)
                git ls-remote "$dir" "$cur*" 2>/dev/null | \
        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" ;;
                        case "$i" in
                        *^{}) ;;
                        *) echo "$i" ;;


@@ -611,7 +611,7 @@ __git_refs ()
                ;;
        *)
                git ls-remote "$dir" HEAD ORIG_HEAD 'refs/tags/*' 'refs/heads/*' 'refs/remotes/*' 2>/dev/null | \
                ;;
        *)
                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/*/}" ;;
                        case "$i" in
                        *^{}) ;;
                        refs/*) echo "${i#refs/*/}" ;;


@@ -636,7 +636,7 @@ __git_refs_remotes ()
 {
        local i hash
        git ls-remote "$1" 'refs/heads/*' 2>/dev/null | \
 {
        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
 }
                echo "$i:refs/remotes/$1/${i#refs/heads/}"
        done
 }


@@ -1863,7 +1863,7 @@ __git_config_get_set_variables ()
        done
 
        git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
        done
 
        git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |

-       while read line
+       while read -r line

        do
                case "$line" in
                *.*=*)
        do
                case "$line" in
                *.*=*)