Merge branch 'sg/completion-gitcomp-nl-for-refs'

Code clean-up.

* sg/completion-gitcomp-nl-for-refs:
completion: use __gitcomp_nl() for completing refs

diff --combined contrib/completion/git-completion.bash
index 931eac29ad73e84abaf87bf1d7a39f56b9a25b34,05a3aa426f547b8695e7d7ceeba2dd722c557120..fbe597232c11c05c1b8f9c366232d52f050b8d51
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -411,9 -411,12 +411,9 @@@ __git_refs_remotes (
  
  __git_remotes ()
  {
 -      local i IFS=$'\n' d="$(__gitdir)"
 +      local d="$(__gitdir)"
        test -d "$d/remotes" && ls -1 "$d/remotes"
 -      for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do
 -              i="${i#remote.}"
 -              echo "${i/.url*/}"
 -      done
 +      git --git-dir="$d" remote
  }
  
  __git_list_merge_strategies ()
@@@ -977,7 -980,7 +977,7 @@@ _git_branch (
  
        case "$cur" in
        --set-upstream-to=*)
-               __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"
+               __gitcomp_nl "$(__git_refs)" "" "${cur##--set-upstream-to=}"
                ;;
        --*)
                __gitcomp "
@@@ -1045,7 -1048,7 +1045,7 @@@ _git_checkout (
  
  _git_cherry ()
  {
-       __gitcomp "$(__git_refs)"
+       __gitcomp_nl "$(__git_refs)"
  }
  
  _git_cherry_pick ()
@@@ -1302,7 -1305,7 +1302,7 @@@ _git_gitk (
  }
  
  __git_match_ctag() {
 -      awk "/^${1////\\/}/ { print \$1 }" "$2"
 +      awk "/^${1//\//\\/}/ { print \$1 }" "$2"
  }
  
  _git_grep ()
@@@ -1422,7 -1425,7 +1422,7 @@@ __git_log_gitk_options=
  # Options that go well for log and shortlog (not gitk)
  __git_log_shortlog_options="
        --author= --committer= --grep=
 -      --all-match
 +      --all-match --invert-grep
  "
  
  __git_log_pretty_formats="oneline short medium full fuller email raw format:"
@@@ -2011,7 -2014,6 +2011,7 @@@ _git_config (
                color.status.changed
                color.status.header
                color.status.nobranch
 +              color.status.unmerged
                color.status.untracked
                color.status.updated
                color.ui
@@@ -2186,7 -2188,6 +2186,7 @@@
                pull.octopus
                pull.twohead
                push.default
 +              push.followTags
                rebase.autosquash
                rebase.stat
                receive.autogc