From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Nov 2006 17:17:37 +0000 (-0800)
Subject: Merge branch 'rs/cherry'
X-Git-Tag: v1.4.4-rc1~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/56532fa147d56057ad4121f5ccea8e254748afdd?hp=-c

Merge branch 'rs/cherry'

* rs/cherry:
Make git-cherry handle root trees
Built-in cherry
---

56532fa147d56057ad4121f5ccea8e254748afdd
diff --combined Makefile
index 40e2a680f0,2b53747df1..1cc9f586d6
--- a/Makefile
+++ b/Makefile
@@@ -132,8 -132,6 +132,8 @@@ GITWEB_HOMETEXT = indextext.htm
  GITWEB_CSS = gitweb.css
  GITWEB_LOGO = git-logo.png
  GITWEB_FAVICON = git-favicon.png
 +GITWEB_SITE_HEADER =
 +GITWEB_SITE_FOOTER =
  
  export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
  
@@@ -158,8 -156,8 +158,8 @@@ BASIC_CFLAGS 
  BASIC_LDFLAGS =
  
  SCRIPT_SH = \
 -	git-bisect.sh git-branch.sh git-checkout.sh \
 +	git-bisect.sh git-checkout.sh \
- 	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
+ 	git-clean.sh git-clone.sh git-commit.sh \
  	git-fetch.sh \
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
@@@ -175,7 -173,7 +175,7 @@@
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
  	git-shortlog.perl git-rerere.perl \
 -	git-annotate.perl git-cvsserver.perl \
 +	git-cvsserver.perl \
  	git-svnimport.perl git-cvsexportcommit.perl \
  	git-send-email.perl git-svn.perl
  
@@@ -212,7 -210,7 +212,7 @@@ PROGRAMS = 
  EXTRA_PROGRAMS =
  
  BUILT_INS = \
- 	git-format-patch$X git-show$X git-whatchanged$X \
+ 	git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
  	git-get-tar-commit-id$X \
  	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
@@@ -267,10 -265,8 +267,10 @@@ LIB_OBJS = 
  
  BUILTIN_OBJS = \
  	builtin-add.o \
 +	builtin-annotate.o \
  	builtin-apply.o \
  	builtin-archive.o \
 +	builtin-branch.o \
  	builtin-cat-file.o \
  	builtin-checkout-index.o \
  	builtin-check-ref-format.o \
@@@ -282,7 -278,6 +282,7 @@@
  	builtin-diff-stages.o \
  	builtin-diff-tree.o \
  	builtin-fmt-merge-msg.o \
 +	builtin-for-each-ref.o \
  	builtin-grep.o \
  	builtin-init-db.o \
  	builtin-log.o \
@@@ -311,9 -306,7 +311,9 @@@
  	builtin-update-ref.o \
  	builtin-upload-archive.o \
  	builtin-verify-pack.o \
 -	builtin-write-tree.o
 +	builtin-write-tree.o \
 +	builtin-show-ref.o \
 +	builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  EXTLIBS = -lz
@@@ -682,8 -675,6 +682,8 @@@ gitweb/gitweb.cgi: gitweb/gitweb.per
  	    -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
  	    -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
  	    -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
 +	    -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
 +	    -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
  	    $< >$@+
  	chmod +x $@+
  	mv $@+ $@
diff --combined builtin.h
index f7150aa6b8,285d98fd9f..a9b28ed899
--- a/builtin.h
+++ b/builtin.h
@@@ -14,13 -14,12 +14,14 @@@ extern int write_tree(unsigned char *sh
  extern void prune_packed_objects(int);
  
  extern int cmd_add(int argc, const char **argv, const char *prefix);
 +extern int cmd_annotate(int argc, const char **argv, const char *prefix);
  extern int cmd_apply(int argc, const char **argv, const char *prefix);
  extern int cmd_archive(int argc, const char **argv, const char *prefix);
 +extern int cmd_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
  extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
  extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
+ extern int cmd_cherry(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
@@@ -29,7 -28,6 +30,7 @@@ extern int cmd_diff(int argc, const cha
  extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
 +extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_format_patch(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);
@@@ -52,8 -50,8 +53,8 @@@ extern int cmd_rev_list(int argc, cons
  extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
  extern int cmd_rm(int argc, const char **argv, const char *prefix);
  extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
 -extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_show(int argc, const char **argv, const char *prefix);
 +extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
  extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
@@@ -66,7 -64,5 +67,7 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
  extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
 +extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
 +extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
  
  #endif
diff --combined git.c
index af181d93b1,f8c991ff8c..d6c2d2db60
--- a/git.c
+++ b/git.c
@@@ -219,13 -219,12 +219,14 @@@ static void handle_internal_command(in
  		int option;
  	} commands[] = {
  		{ "add", cmd_add, RUN_SETUP },
 +		{ "annotate", cmd_annotate, },
  		{ "apply", cmd_apply },
  		{ "archive", cmd_archive },
 +		{ "branch", cmd_branch },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "checkout-index", cmd_checkout_index, RUN_SETUP },
  		{ "check-ref-format", cmd_check_ref_format },
+ 		{ "cherry", cmd_cherry, RUN_SETUP },
  		{ "commit-tree", cmd_commit_tree, RUN_SETUP },
  		{ "count-objects", cmd_count_objects, RUN_SETUP },
  		{ "diff", cmd_diff, RUN_SETUP | USE_PAGER },
@@@ -234,7 -233,6 +235,7 @@@
  		{ "diff-stages", cmd_diff_stages, RUN_SETUP },
  		{ "diff-tree", cmd_diff_tree, RUN_SETUP },
  		{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 +		{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
  		{ "format-patch", cmd_format_patch, RUN_SETUP },
  		{ "get-tar-commit-id", cmd_get_tar_commit_id },
  		{ "grep", cmd_grep, RUN_SETUP },
@@@ -270,8 -268,6 +271,8 @@@
  		{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
  		{ "write-tree", cmd_write_tree, RUN_SETUP },
  		{ "verify-pack", cmd_verify_pack },
 +		{ "show-ref", cmd_show_ref, RUN_SETUP },
 +		{ "pack-refs", cmd_pack_refs, RUN_SETUP },
  	};
  	int i;