Merge branch 'js/remote-improvements'

* js/remote-improvements: (23 commits)
  builtin-remote.c: no "commented out" code, please
  builtin-remote: new show output style for push refspecs
  builtin-remote: new show output style
  remote: make guess_remote_head() use exact HEAD lookup if it is available
  builtin-remote: add set-head subcommand
  builtin-remote: teach show to display remote HEAD
  builtin-remote: fix two inconsistencies in the output of "show <remote>"
  builtin-remote: make get_remote_ref_states() always populate states.tracked
  builtin-remote: rename variables and eliminate redundant function call
  builtin-remote: remove unused code in get_ref_states
  builtin-remote: refactor duplicated cleanup code
  string-list: new for_each_string_list() function
  remote: make match_refs() not short-circuit
  remote: make match_refs() copy src ref before assigning to peer_ref
  remote: let guess_remote_head() optionally return all matches
  remote: make copy_ref() perform a deep copy
  remote: simplify guess_remote_head()
  move locate_head() to remote.c
  move duplicated ref_newer() to remote.c
  move duplicated get_local_heads() to remote.c
  ...

Conflicts:
	builtin-clone.c

diff --cc Makefile
Simple merge

diff --cc builtin-clone.c
index 39523cee309f16268130427f8209f9a5be0cdc70,3146ca87f88e8f187c47b4a375c19b499c024b33..efbc804a3d1c1f9edb1c8c21bc382f8c1c3836ff
--- 1/builtin-clone.c
--- 2/builtin-clone.c
+++ b/builtin-clone.c
@@@ -20,7 -20,7 +20,8 @@@
  #include "dir.h"
  #include "pack-refs.h"
  #include "sigchain.h"
+ #include "remote.h"
 +#include "run-command.h"
  
  /*
   * Overall FIXMEs:

diff --cc builtin-remote.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc http-push.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc t/t5540-http-push.sh
Simple merge