From: Junio C Hamano <junkio@cox.net>
Date: Tue, 8 Aug 2006 22:42:20 +0000 (-0700)
Subject: Merge branch 'master' into mk/rename
X-Git-Tag: v1.4.3-rc1~278^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/102cb08521df5f33b30c0ef41a1078a61e593943?ds=inline;hp=-c

Merge branch 'master' into mk/rename
---

102cb08521df5f33b30c0ef41a1078a61e593943
diff --combined Makefile
index dc39f72f1e,0761d6c6ed..733fa660d9
--- a/Makefile
+++ b/Makefile
@@@ -173,23 -173,32 +173,23 @@@ SIMPLE_PROGRAMS = 
  
  # ... and all the rest that could be moved out of bindir to gitexecdir
  PROGRAMS = \
 -	git-checkout-index$X \
  	git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
  	git-merge-base$X \
 -	git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
 +	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
  	git-peek-remote$X git-receive-pack$X \
  	git-send-pack$X git-shell$X \
  	git-show-index$X git-ssh-fetch$X \
  	git-ssh-upload$X git-unpack-file$X \
 -	git-unpack-objects$X git-update-server-info$X \
 +	git-update-server-info$X \
  	git-upload-pack$X git-verify-pack$X \
 -	git-symbolic-ref$X \
 -	git-name-rev$X git-pack-redundant$X git-var$X \
 +	git-pack-redundant$X git-var$X \
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
 -BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
 -	git-count-objects$X git-diff$X git-push$X git-mailsplit$X \
 -	git-grep$X git-add$X git-rm$X git-rev-list$X git-stripspace$X \
 -	git-check-ref-format$X git-rev-parse$X git-mailinfo$X \
 -	git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \
 -	git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
 -	git-read-tree$X git-commit-tree$X git-write-tree$X \
 -	git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
 -	git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
 -	git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
 -	git-repo-config$X
 +BUILT_INS = \
 +	git-format-patch$X git-show$X git-whatchanged$X \
 +	git-get-tar-commit-id$X \
 +	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -218,7 -227,7 +218,7 @@@ LIB_H = 
  	blob.h cache.h commit.h csum-file.h delta.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -	tree-walk.h log-tree.h dir.h path-list.h
 +	tree-walk.h log-tree.h dir.h path-list.h builtin.h
  
  DIFF_OBJS = \
  	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -233,49 -242,20 +233,49 @@@ LIB_OBJS = 
  	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
  	tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
  	fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
 -	alloc.o merge-file.o path-list.o $(DIFF_OBJS)
 +	alloc.o merge-file.o path-list.o help.o $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -	builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
 -	builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
 -	builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
 -	builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
 -	builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
 -	builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
 -	builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
 -	builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
 -	builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
 -	builtin-mv.o builtin-prune-packed.o builtin-repo-config.o
 +	builtin-add.o \
 +	builtin-apply.o \
 +	builtin-cat-file.o \
 +	builtin-checkout-index.o \
 +	builtin-check-ref-format.o \
 +	builtin-commit-tree.o \
 +	builtin-count-objects.o \
 +	builtin-diff.o \
 +	builtin-diff-files.o \
 +	builtin-diff-index.o \
 +	builtin-diff-stages.o \
 +	builtin-diff-tree.o \
 +	builtin-fmt-merge-msg.o \
 +	builtin-grep.o \
 +	builtin-init-db.o \
 +	builtin-log.o \
 +	builtin-ls-files.o \
 +	builtin-ls-tree.o \
 +	builtin-mailinfo.o \
 +	builtin-mailsplit.o \
 +	builtin-mv.o \
 +	builtin-name-rev.o \
 +	builtin-pack-objects.o \
 +	builtin-prune.o \
 +	builtin-prune-packed.o \
 +	builtin-push.o \
 +	builtin-read-tree.o \
 +	builtin-repo-config.o \
 +	builtin-rev-list.o \
 +	builtin-rev-parse.o \
 +	builtin-rm.o \
 +	builtin-show-branch.o \
 +	builtin-stripspace.o \
 +	builtin-symbolic-ref.o \
 +	builtin-tar-tree.o \
 +	builtin-unpack-objects.o \
 +	builtin-update-index.o \
 +	builtin-update-ref.o \
 +	builtin-upload-tar.o \
 +	builtin-write-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -334,9 -314,9 +334,9 @@@ ifeq ($(uname_O),Cygwin
  	NO_D_TYPE_IN_DIRENT = YesPlease
  	NO_D_INO_IN_DIRENT = YesPlease
  	NO_STRCASESTR = YesPlease
- 	NO_STRLCPY = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
  	NEEDS_LIBICONV = YesPlease
+ 	NO_C99_FORMAT = YesPlease
  	# There are conflicting reports about this.
  	# On some boxes NO_MMAP is needed, and not so elsewhere.
  	# Try uncommenting this if you see things break -- YMMV.
@@@ -556,7 -536,7 +556,7 @@@ git$X: git.c common-cmds.h $(BUILTIN_OB
  		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
 -builtin-help.o: common-cmds.h
 +help.o: common-cmds.h
  
  $(BUILT_INS): git$X
  	rm -f $@ && ln git$X $@
diff --combined git.c
index 96e596b1a3,18ba14ade1..db0f86790d
--- a/git.c
+++ b/git.c
@@@ -213,8 -213,8 +213,8 @@@ static int handle_alias(int *argcp, con
  
  const char git_version_string[] = GIT_VERSION;
  
 -#define NEEDS_PREFIX 1
 -#define USE_PAGER 2
 +#define RUN_SETUP	(1<<0)
 +#define USE_PAGER	(1<<1)
  
  static void handle_internal_command(int argc, const char **argv, char **envp)
  {
@@@ -224,52 -224,47 +224,52 @@@
  		int (*fn)(int, const char **, const char *);
  		int option;
  	} commands[] = {
 -		{ "version", cmd_version },
 -		{ "help", cmd_help },
 -		{ "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
 -		{ "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
 -		{ "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
 -		{ "push", cmd_push, NEEDS_PREFIX },
 -		{ "format-patch", cmd_format_patch, NEEDS_PREFIX },
 +		{ "add", cmd_add, RUN_SETUP },
 +		{ "apply", cmd_apply },
 +		{ "cat-file", cmd_cat_file, RUN_SETUP },
 +		{ "checkout-index", cmd_checkout_index, RUN_SETUP },
 +		{ "check-ref-format", cmd_check_ref_format },
 +		{ "commit-tree", cmd_commit_tree, RUN_SETUP },
  		{ "count-objects", cmd_count_objects },
 -		{ "diff", cmd_diff, NEEDS_PREFIX },
 -		{ "grep", cmd_grep, NEEDS_PREFIX },
 -		{ "rm", cmd_rm, NEEDS_PREFIX },
 -		{ "add", cmd_add, NEEDS_PREFIX },
 -		{ "rev-list", cmd_rev_list, NEEDS_PREFIX },
 -		{ "init-db", cmd_init_db },
 +		{ "diff", cmd_diff, RUN_SETUP },
 +		{ "diff-files", cmd_diff_files, RUN_SETUP },
 +		{ "diff-index", cmd_diff_index, RUN_SETUP },
 +		{ "diff-stages", cmd_diff_stages, RUN_SETUP },
 +		{ "diff-tree", cmd_diff_tree, RUN_SETUP },
 +		{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 +		{ "format-patch", cmd_format_patch, RUN_SETUP },
  		{ "get-tar-commit-id", cmd_get_tar_commit_id },
 -		{ "upload-tar", cmd_upload_tar },
 -		{ "check-ref-format", cmd_check_ref_format },
 -		{ "ls-files", cmd_ls_files, NEEDS_PREFIX },
 -		{ "ls-tree", cmd_ls_tree, NEEDS_PREFIX },
 -		{ "tar-tree", cmd_tar_tree, NEEDS_PREFIX },
 -		{ "read-tree", cmd_read_tree, NEEDS_PREFIX },
 -		{ "commit-tree", cmd_commit_tree, NEEDS_PREFIX },
 -		{ "apply", cmd_apply },
 -		{ "show-branch", cmd_show_branch, NEEDS_PREFIX },
 -		{ "diff-files", cmd_diff_files, NEEDS_PREFIX },
 -		{ "diff-index", cmd_diff_index, NEEDS_PREFIX },
 -		{ "diff-stages", cmd_diff_stages, NEEDS_PREFIX },
 -		{ "diff-tree", cmd_diff_tree, NEEDS_PREFIX },
 -		{ "cat-file", cmd_cat_file, NEEDS_PREFIX },
 -		{ "rev-parse", cmd_rev_parse, NEEDS_PREFIX },
 -		{ "write-tree", cmd_write_tree, NEEDS_PREFIX },
 -		{ "mailsplit", cmd_mailsplit },
 +		{ "grep", cmd_grep, RUN_SETUP },
 +		{ "help", cmd_help },
 +		{ "init-db", cmd_init_db },
 +		{ "log", cmd_log, RUN_SETUP | USE_PAGER },
 +		{ "ls-files", cmd_ls_files, RUN_SETUP },
 +		{ "ls-tree", cmd_ls_tree, RUN_SETUP },
  		{ "mailinfo", cmd_mailinfo },
 -		{ "stripspace", cmd_stripspace },
 -		{ "update-index", cmd_update_index, NEEDS_PREFIX },
 -		{ "update-ref", cmd_update_ref, NEEDS_PREFIX },
 -		{ "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
 -		{ "prune", cmd_prune, NEEDS_PREFIX },
 -		{ "mv", cmd_mv, NEEDS_PREFIX },
 -		{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
 +		{ "mailsplit", cmd_mailsplit },
 +		{ "mv", cmd_mv, RUN_SETUP },
 +		{ "name-rev", cmd_name_rev, RUN_SETUP },
 +		{ "pack-objects", cmd_pack_objects, RUN_SETUP },
 +		{ "prune", cmd_prune, RUN_SETUP },
 +		{ "prune-packed", cmd_prune_packed, RUN_SETUP },
- 		{ "push", cmd_push },
++		{ "push", cmd_push, RUN_SETUP },
 +		{ "read-tree", cmd_read_tree, RUN_SETUP },
  		{ "repo-config", cmd_repo_config },
 +		{ "rev-list", cmd_rev_list, RUN_SETUP },
 +		{ "rev-parse", cmd_rev_parse, RUN_SETUP },
 +		{ "rm", cmd_rm, RUN_SETUP },
 +		{ "show-branch", cmd_show_branch, RUN_SETUP },
 +		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
 +		{ "stripspace", cmd_stripspace },
 +		{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 +		{ "tar-tree", cmd_tar_tree, RUN_SETUP },
 +		{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
 +		{ "update-index", cmd_update_index, RUN_SETUP },
 +		{ "update-ref", cmd_update_ref, RUN_SETUP },
 +		{ "upload-tar", cmd_upload_tar },
 +		{ "version", cmd_version },
 +		{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
 +		{ "write-tree", cmd_write_tree, RUN_SETUP },
  	};
  	int i;
  
@@@ -286,7 -281,7 +286,7 @@@
  			continue;
  
  		prefix = NULL;
 -		if (p->option & NEEDS_PREFIX)
 +		if (p->option & RUN_SETUP)
  			prefix = setup_git_directory();
  		if (p->option & USE_PAGER)
  			setup_pager();