Merge branch 'jc/heads-are-branches'

The "--heads" option of "ls-remote" and "show-ref" has been been
deprecated; "--branches" replaces "--heads".

* jc/heads-are-branches:
  show-ref: introduce --branches and deprecate --heads
  ls-remote: introduce --branches and deprecate --heads
  refs: call branches branches

diff --cc builtin/show-ref.c
index 3114bdc391aa925ee354d85eaf33052ef96af0b8,f634bc3e443956111c209e6fdc32ce91fddb1242..839a5c29f31439e104ef99daf3460709e3e45909
--- 1/builtin/show-ref.c
--- 2/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@@ -206,20 -205,14 +206,20 @@@ static int cmd_show_ref__patterns(cons
                show_ref_data.patterns = patterns;
  
        if (opts->show_head)
 -              head_ref(show_ref, &show_ref_data);
 +              refs_head_ref(get_main_ref_store(the_repository), show_ref,
 +                            &show_ref_data);
-       if (opts->heads_only || opts->tags_only) {
-               if (opts->heads_only)
+       if (opts->branches_only || opts->tags_only) {
+               if (opts->branches_only)
 -                      for_each_fullref_in("refs/heads/", show_ref, &show_ref_data);
 +                      refs_for_each_fullref_in(get_main_ref_store(the_repository),
 +                                               "refs/heads/", NULL,
 +                                               show_ref, &show_ref_data);
                if (opts->tags_only)
 -                      for_each_fullref_in("refs/tags/", show_ref, &show_ref_data);
 +                      refs_for_each_fullref_in(get_main_ref_store(the_repository),
 +                                               "refs/tags/", NULL, show_ref,
 +                                               &show_ref_data);
        } else {
 -              for_each_ref(show_ref, &show_ref_data);
 +              refs_for_each_ref(get_main_ref_store(the_repository),
 +                                show_ref, &show_ref_data);
        }
        if (!show_ref_data.found_match)
                return 1;

diff --cc remote.h
Simple merge