Merge branch 'ks/branch-set-upstream' into next

"branch --set-upstream" that has been deprecated in Git 1.8 has
finally been retired.

* ks/branch-set-upstream:
branch: quote branch/ref names to improve readability
builtin/branch: stop supporting the "--set-upstream" option
t3200: cleanup cruft of a test

diff --combined Documentation/git-branch.txt
index d0b33587717a198655164f5dd5e35e116a8a30e0,ba805749ec6cedcd2f9128fc12b33999f08b09ae..e292737b9c5ab65d53ed3caf2e553a7e7e098fb5
--- 1/Documentation/git-branch.txt
--- 2/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -195,10 -195,8 +195,8 @@@ start-point is either a local or remote
        branch.autoSetupMerge configuration variable is true.
  
  --set-upstream::
-       If specified branch does not exist yet or if `--force` has been
-       given, acts exactly like `--track`. Otherwise sets up configuration
-       like `--track` would when creating the branch, except that where
-       branch points to is not changed.
+       As this option had confusing syntax, it is no longer supported.
+       Please use `--track` or `--set-upstream-to` instead.
  
  -u <upstream>::
  --set-upstream-to=<upstream>::
@@@ -267,8 -265,8 +265,8 @@@
        Only list branches of the given object.
  
  --format <format>::
 -      A string that interpolates `%(fieldname)` from the object
 -      pointed at by a ref being shown.  The format is the same as
 +      A string that interpolates `%(fieldname)` from a branch ref being shown
 +      and the object it points at.  The format is the same as
        that of linkgit:git-for-each-ref[1].
  
  Examples