From: Junio C Hamano <junkio@cox.net>
Date: Sun, 30 Apr 2006 08:00:55 +0000 (-0700)
Subject: Merge branch 'lt/push' into next
X-Git-Tag: v1.4.1-rc1~163
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b401891a212950762e8673eaaebe4b6e6c79c0c?hp=-c

Merge branch 'lt/push' into next

* lt/push:
git builtin "push"
git-format-patch: Use rfc2822 compliant date.
---

6b401891a212950762e8673eaaebe4b6e6c79c0c
diff --combined Makefile
index 895e6a1e4a,9919992392..f184a8d4bb
--- a/Makefile
+++ b/Makefile
@@@ -204,7 -204,7 +204,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o csum-file.o \
 +	blob.o commit.o connect.o csum-file.o cache-tree.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
  	quote.o read-cache.o refs.o run-command.o \
@@@ -214,7 -214,7 +214,8 @@@
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
- 	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o
 -	builtin-log.o builtin-help.o builtin-push.o
++	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
++	builtin-push.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -609,10 -609,7 +610,10 @@@ test-date$X: test-date.c date.o ctype.
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
  
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
 -	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
diff --combined builtin.h
index bf310dda9e,94fa9b5465..8d5744fa42
--- a/builtin.h
+++ b/builtin.h
@@@ -19,8 -19,7 +19,10 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, char **envp);
  extern int cmd_show(int argc, const char **argv, char **envp);
  extern int cmd_log(int argc, const char **argv, char **envp);
 +extern int cmd_format_patch(int argc, const char **argv, char **envp);
 +extern int cmd_count_objects(int argc, const char **argv, char **envp);
 +extern int cmd_diff(int argc, const char **argv, char **envp);
  
+ extern int cmd_push(int argc, const char **argv, char **envp);
+ 
  #endif
diff --combined git.c
index a6ec3bcbe5,fd479e97c1..6a771747eb
--- a/git.c
+++ b/git.c
@@@ -46,9 -46,7 +46,10 @@@ static void handle_internal_command(in
  		{ "log", cmd_log },
  		{ "whatchanged", cmd_whatchanged },
  		{ "show", cmd_show },
 +		{ "fmt-patch", cmd_format_patch },
 +		{ "count-objects", cmd_count_objects },
 +		{ "diffn", cmd_diff },
+ 		{ "push", cmd_push },
  	};
  	int i;