From: Junio C Hamano Date: Sat, 30 Jun 2007 18:17:19 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.3-rc0~39 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/90c88a698e8bf36ff5812a177f8b6c2f878f229c?hp=-c Merge branch 'maint' * maint: Correct the name of NO_R_TO_GCC_LINKER in the comment describing it. git-remote: document -n repack: improve documentation on -a option --- 90c88a698e8bf36ff5812a177f8b6c2f878f229c diff --combined Documentation/git-remote.txt index ab232c2f68,b35c65ba3b..61a6022ce8 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@@ -49,6 -49,9 +49,9 @@@ branch the `HEAD` at the remote reposit 'show':: Gives some information about the remote . + + + With `-n` option, the remote heads are not queried first with + `git ls-remote `; cached information is used instead. 'prune':: @@@ -56,6 -59,10 +59,10 @@@ Deletes all stale tracking branches und These stale branches have already been removed from the remote repository referenced by , but are still locally available in "remotes/". + + + With `-n` option, the remote heads are not confirmed first with `git + ls-remote `; cached information is used instead. Use with + caution. 'update':: @@@ -128,3 -135,4 +135,3 @@@ Documentation by J. Bruce Fields and th GIT --- Part of the gitlink:git[7] suite - diff --combined Documentation/git-repack.txt index c33a512ffb,c57013b953..28949397ca --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@@ -14,7 -14,8 +14,8 @@@ DESCRIPTIO ----------- This script is used to combine all objects that do not currently - reside in a "pack", into a pack. + reside in a "pack", into a pack. It can also be used to re-organise + existing packs into a single, more efficient pack. A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an @@@ -28,11 -29,13 +29,13 @@@ OPTION -a:: Instead of incrementally packing the unpacked objects, - pack everything available into a single pack. + pack everything referenced into a single pack. Especially useful when packing a repository that is used for private development and there is no need to worry - about people fetching via dumb file transfer protocols - from it. Use with '-d'. + about people fetching via dumb protocols from it. Use + with '-d'. This will clean up the objects that `git prune` + leaves behind, but `git fsck --full` shows as + dangling. -d:: After packing, if the newly created packs make some @@@ -65,11 -68,6 +68,11 @@@ to be applied that many times to get to the necessary object. The default value for --window is 10 and --depth is 50. +--max-pack-size=:: + Maximum size of each output packfile, expressed in MiB. + If specified, multiple packfiles may be created. + The default is unlimited. + Configuration ------------- @@@ -101,3 -99,4 +104,3 @@@ gitlink:git-prune-packed[1 GIT --- Part of the gitlink:git[7] suite - diff --combined Makefile index a98e27aa7e,eb443bddb9..5d60dc8e12 --- a/Makefile +++ b/Makefile @@@ -94,9 -94,9 +94,9 @@@ all: # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). # - # Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that - # tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib" - # is used instead. + # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib" + # that tells runtime paths to dynamic libraries; + # "-Wl,-rpath=/path/lib" is used instead. # # Define USE_NSEC below if you want git to care about sub-second file mtimes # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and @@@ -146,8 -146,8 +146,8 @@@ STRIP ?= stri prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) -sharedir = $(prefix)/share/ -template_dir = $(sharedir)/git-core/templates/ +sharedir = $(prefix)/share +template_dir = $(sharedir)/git-core/templates ifeq ($(prefix),/usr) sysconfdir = /etc else @@@ -208,11 -208,10 +208,11 @@@ 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 \ + git-filter-branch.sh SCRIPT_PERL = \ git-add--interactive.perl \ @@@ -241,6 -240,7 +241,6 @@@ PROGRAMS = 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 \ git-daemon$X \ git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \ git-peek-remote$X git-receive-pack$X \ @@@ -298,8 -298,7 +298,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 \ @@@ -321,7 -320,7 +321,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 \ @@@ -747,13 -746,9 +747,13 @@@ gitk-wish: gitk GIT-GUI-VAR chmod +x $@+ && \ mv -f $@+ $@ -git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS +git.o: git.c common-cmds.h GIT-CFLAGS + $(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \ + $(ALL_CFLAGS) -c $(filter %.c,$^) + +git$X: git.o $(BUILTIN_OBJS) $(GITLIBS) $(QUIET_LINK)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \ - $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \ + $(ALL_CFLAGS) -o $@ $(filter %.c,$^) git.o \ $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) help.o: common-cmds.h @@@ -764,8 -759,6 +764,8 @@@ git-merge-subtree$X: git-merge-recursiv $(BUILT_INS): git$X $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@ +common-cmds.h: ./generate-cmdlist.sh + common-cmds.h: $(wildcard Documentation/git-*.txt) $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@ @@@ -863,8 -856,6 +863,8 @@@ git$X git.spec %.o: %.c GIT-CFLAGS $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $< +%.s: %.c GIT-CFLAGS + $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $< %.o: %.S $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $< @@@ -961,7 -952,7 +961,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) @@@ -974,12 -965,26 +974,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-delta$X: test-delta.o diff-delta.o patch-delta.o $(GITLIBS) - $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) - -test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS) - $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) +test-date$X: date.o ctype.o -test-sha1$X: test-sha1.o $(GITLIBS) - $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) +test-delta$X: diff-delta.o patch-delta.o -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 @@@ -1029,16 -1034,15 +1029,16 @@@ git.spec: git.spec.i mv $@+ $@ GIT_TARNAME=git-$(GIT_VERSION) -dist: git.spec git-archive +dist: git.spec git-archive configure ./git-archive --format=tar \ --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) - @cp git.spec $(GIT_TARNAME) + @cp git.spec configure $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version $(TAR) rf $(GIT_TARNAME).tar \ $(GIT_TARNAME)/git.spec \ + $(GIT_TARNAME)/configure \ $(GIT_TARNAME)/version \ $(GIT_TARNAME)/git-gui/version @rm -rf $(GIT_TARNAME) @@@ -1071,9 -1075,8 +1071,9 @@@ dist-doc clean: rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \ - test-chmtime$X test-genrandom$X $(LIB_FILE) $(XDIFF_LIB) + $(LIB_FILE) $(XDIFF_LIB) rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X + rm -f $(TEST_PROGRAMS) rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -rf autom4te.cache rm -f configure config.log config.mak.autogen config.mak.append config.status config.cache