From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 19:05:19 +0000 (-0700)
Subject: Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
X-Git-Tag: v1.7.11.6~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47bc16b3fa96692102fc840f2d8bbdbbae97dd74;p=git.git

Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11

* lp/no-cmd-http-fetch:
  builtin.h: remove unused cmd_<foo> declarations
---

47bc16b3fa96692102fc840f2d8bbdbbae97dd74
diff --cc builtin.h
index e426de3ff,3e4481620..cd9141932
--- a/builtin.h
+++ b/builtin.h
@@@ -83,10 -57,7 +83,9 @@@ extern int cmd_fsck(int argc, const cha
  extern int cmd_gc(int argc, const char **argv, const char *prefix);
  extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
  extern int cmd_grep(int argc, const char **argv, const char *prefix);
 +extern int cmd_hash_object(int argc, const char **argv, const char *prefix);
  extern int cmd_help(int argc, const char **argv, const char *prefix);
- extern int cmd_http_fetch(int argc, const char **argv, const char *prefix);
 +extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
  extern int cmd_init_db(int argc, const char **argv, const char *prefix);
  extern int cmd_log(int argc, const char **argv, const char *prefix);
  extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
@@@ -106,11 -74,7 +105,10 @@@ extern int cmd_mktag(int argc, const ch
  extern int cmd_mktree(int argc, const char **argv, const char *prefix);
  extern int cmd_mv(int argc, const char **argv, const char *prefix);
  extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
 +extern int cmd_notes(int argc, const char **argv, const char *prefix);
  extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
 +extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
 +extern int cmd_patch_id(int argc, const char **argv, const char *prefix);
- extern int cmd_pickaxe(int argc, const char **argv, const char *prefix);
  extern int cmd_prune(int argc, const char **argv, const char *prefix);
  extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
  extern int cmd_push(int argc, const char **argv, const char *prefix);
@@@ -140,11 -101,7 +138,10 @@@ extern int cmd_unpack_file(int argc, co
  extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
  extern int cmd_update_index(int argc, const char **argv, const char *prefix);
  extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
 +extern int cmd_update_server_info(int argc, const char **argv, const char *prefix);
  extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
 +extern int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix);
- extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
 +extern int cmd_var(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
  extern int cmd_version(int argc, const char **argv, const char *prefix);
  extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);