Merge branch 'js/remote-improvements'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Mar 2009 01:55:06 +0000 (18:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Mar 2009 01:55:06 +0000 (18:55 -0700)
commitca8a36e6e0cf6ee952df16160bc853630c56b997
treea7a0cc36a4aac48173264e8d84dbe4ba1dcd7fad
parenta57ca9dd400c8459a3cd3d769bab317f57d1e9ac
parent8321c56b6bae25a2d70790f452df894be536b32c
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
Makefile
builtin-clone.c
builtin-remote.c
cache.h
contrib/completion/git-completion.bash
http-push.c
remote.c
t/t5540-http-push.sh