From: Junio C Hamano <junkio@cox.net>
Date: Sun, 3 Jun 2007 02:04:54 +0000 (-0700)
Subject: Merge branches 'lh/submodules' and 'pb/am'
X-Git-Tag: v1.5.3-rc0~169
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1a8b76912e6ccef6bec3531eec30a0693bc25ae7?ds=inline;hp=-c

Merge branches 'lh/submodules' and 'pb/am'

* lh/submodules:
Add basic test-script for git-submodule
Add git-submodule command

* pb/am:
Remove git-applypatch
git-applymbox: Remove command
---

1a8b76912e6ccef6bec3531eec30a0693bc25ae7
diff --combined .gitignore
index 4dc0c395fa,8fc4923792,b4e72f5fea..15aed70631
--- a/.gitignore
+++ b/.gitignore
@@@@ -7,8 -7,8 -7,6 +7,6 @@@@ git-add--interactiv
   git-am
   git-annotate
   git-apply
-- git-applymbox
-- git-applypatch
   git-archimport
   git-archive
   git-bisect
@@@@ -126,6 -126,7 -124,6 +124,7 @@@@ git-ssh-pus
   git-ssh-upload
   git-status
   git-stripspace
+ +git-submodule
   git-svn
   git-svnimport
   git-symbolic-ref
diff --combined Documentation/cmd-list.perl
index 443802a9a3,51dc6b4105,645e4372e5..a181f753e0
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@@@ -72,8 -72,8 -72,6 +72,6 @@@@ __DATA_
   git-add                                 mainporcelain
   git-am                                  mainporcelain
   git-annotate                            ancillaryinterrogators
-- git-applymbox                           ancillaryinterrogators
-- git-applypatch                          purehelpers
   git-apply                               plumbingmanipulators
   git-archimport                          foreignscminterface
   git-archive                             mainporcelain
@@@@ -180,6 -180,7 -178,6 +178,7 @@@@ git-ssh-fetc
   git-ssh-upload                          synchingrepositories
   git-status                              mainporcelain
   git-stripspace                          purehelpers
+ +git-submodule                           mainporcelain
   git-svn                                 foreignscminterface
   git-svnimport                           foreignscminterface
   git-symbolic-ref                        plumbingmanipulators
diff --combined Documentation/git-am.txt
index f78e5dc28d,25cf84a0c7,7658fbdaef..f3387f5d09
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@@ -13,6 -13,7 -13,7 +13,6 @@@@ SYNOPSI
            [--3way] [--interactive] [--binary]
            [--whitespace=<option>] [-C<n>] [-p<n>]
            <mbox>|<Maildir>...
 --
   'git-am' [--skip | --resolved]
   
   DESCRIPTION
@@@@ -127,8 -128,8 -128,7 +127,7 @@@@ is terminated before the first occurren
   
   When initially invoking it, you give it names of the mailboxes
   to crunch.  Upon seeing the first patch that does not apply, it
-- aborts in the middle, just like 'git-applymbox' does.  You can
-- recover from this in one of two ways:
++ aborts in the middle,.  You can recover from this in one of two ways:
   
   . skip the current patch by re-running the command with '--skip'
     option.
@@@@ -145,7 -146,7 -145,7 +144,7 @@@@ names
   
   SEE ALSO
   --------
-- gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
++ gitlink:git-apply[1].
   
   
   Author
diff --combined Makefile
index cac0a4a2ed,5cf2169ef0,4e63a695f1..a11ff60549
--- a/Makefile
+++ b/Makefile
@@@@ -206,10 -206,10 -206,10 +206,10 @@@@ SCRIPT_SH = 
   	git-repack.sh git-request-pull.sh git-reset.sh \
   	git-sh-setup.sh \
   	git-tag.sh git-verify-tag.sh \
-- 	git-applymbox.sh git-applypatch.sh git-am.sh \
++ 	git-am.sh \
   	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
   	git-merge-resolve.sh git-merge-ours.sh \
- -	git-lost-found.sh git-quiltimport.sh
+ +	git-lost-found.sh git-quiltimport.sh git-submodule.sh
   
   SCRIPT_PERL = \
   	git-add--interactive.perl \
@@@@ -235,7 -235,7 -235,7 +235,7 @@@@ endi
   
   # ... and all the rest that could be moved out of bindir to gitexecdir
   PROGRAMS = \
 --	git-convert-objects$X git-fetch-pack$X git-fsck$X \
 ++	git-convert-objects$X git-fetch-pack$X \
   	git-hash-object$X git-index-pack$X git-local-fetch$X \
   	git-fast-import$X \
   	git-merge-base$X \
@@@@ -246,7 -246,7 -246,7 +246,7 @@@@
   	git-show-index$X git-ssh-fetch$X \
   	git-ssh-upload$X git-unpack-file$X \
   	git-update-server-info$X \
 --	git-upload-pack$X git-verify-pack$X \
 ++	git-upload-pack$X \
   	git-pack-redundant$X git-var$X \
   	git-merge-tree$X git-imap-send$X \
   	git-merge-recursive$X \
@@@@ -296,8 -296,7 -296,7 +296,8 @@@@ LIB_H = 
   	diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.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 unpack-trees.h builtin.h \
 --	utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
 ++	utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
 ++	mailmap.h remote.h
   
   DIFF_OBJS = \
   	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@@ -319,7 -318,7 -318,7 +319,7 @@@@ LIB_OBJS = 
   	write_or_die.o trace.o list-objects.o grep.o match-trees.o \
   	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
   	color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
 --	convert.o attr.o decorate.o progress.o mailmap.o symlinks.o
 ++	convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o
   
   BUILTIN_OBJS = \
   	builtin-add.o \
@@@@ -942,7 -941,7 -941,7 +942,7 @@@@ endi
   
   ### Testing rules
   
 --TEST_PROGRAMS = test-chmtime$X test-genrandom$X
 ++TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X
   
   all:: $(TEST_PROGRAMS)
   
@@@@ -955,12 -954,26 -954,26 +955,12 @@@@ export NO_SVN_TEST
   test: all
   	$(MAKE) -C t/ all
   
 --test-date$X: test-date.c date.o ctype.o
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
 ++test-date$X: date.o ctype.o
   
 --test-delta$X: test-delta.o diff-delta.o patch-delta.o $(GITLIBS)
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 ++test-delta$X: diff-delta.o patch-delta.o
   
 --test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 --
 --test-sha1$X: test-sha1.o $(GITLIBS)
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 --
 --test-match-trees$X: test-match-trees.o $(GITLIBS)
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 --
 --test-chmtime$X: test-chmtime.c
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $<
 --
 --test-genrandom$X: test-genrandom.c
 --	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $<
 ++test-%$X: test-%.o $(GITLIBS)
 ++	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
   
   check-sha1:: test-sha1$X
   	./test-sha1.sh