From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Mar 2007 03:47:46 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~102
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=253e772edeb56092e0fad43ec0640658671313c5;p=git.git

Merge branch 'maint'

* maint:
  Unset NO_C99_FORMAT on Cygwin.
  Fix a "pointer type missmatch" warning.
  Fix some "comparison is always true/false" warnings.
  Fix an "implicit function definition" warning.
  Fix a "label defined but unreferenced" warning.
  Document the config variable format.suffix
  git-merge: fail correctly when we cannot fast forward.
  builtin-archive: use RUN_SETUP
  Fix git-gc usage note
---

253e772edeb56092e0fad43ec0640658671313c5
diff --cc git.c
index 9b37f4232,660b0a6dc..04fc99a3d
--- a/git.c
+++ b/git.c
@@@ -226,10 -226,9 +226,10 @@@ static void handle_internal_command(in
  		{ "add", cmd_add, RUN_SETUP | NOT_BARE },
  		{ "annotate", cmd_annotate, USE_PAGER },
  		{ "apply", cmd_apply },
- 		{ "archive", cmd_archive },
+ 		{ "archive", cmd_archive, RUN_SETUP },
  		{ "blame", cmd_blame, RUN_SETUP },
  		{ "branch", cmd_branch, RUN_SETUP },
 +		{ "bundle", cmd_bundle },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "checkout-index", cmd_checkout_index, RUN_SETUP },
  		{ "check-ref-format", cmd_check_ref_format },