From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Mar 2009 01:55:06 +0000 (-0700)
Subject: Merge branch 'js/remote-improvements'
X-Git-Tag: v1.6.3-rc0~145
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca8a36e6e0cf6ee952df16160bc853630c56b997?hp=ca8a36e6e0cf6ee952df16160bc853630c56b997

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
---