Merge branch 'js/remote-improvements' into next
commit104a9146d479fd1ebc07e1c15ac2fda42795ea63
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2009 00:03:11 +0000 (5 16:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2009 00:03:11 +0000 (5 16:03 -0800)
tree5ecaa83190cc1cc30a2eab91df3bdfc4bdd4a522
parent34a1d84c2af3361ae5d2663cf56bc432877181ba
parente5dcbfd9ab7028c464909f26f523b85c1de912a2
Merge branch 'js/remote-improvements' into next

* js/remote-improvements: (22 commits)
  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
  refactor find_ref_by_name() to accept const list
  ...

Conflicts:
builtin-clone.c
builtin-clone.c
cache.h
contrib/completion/git-completion.bash
remote.c
t/t5540-http-push.sh