--- git-core-1.4.4.2.orig/debian/diff/genindex.diff +++ git-core-1.4.4.2/debian/diff/genindex.diff @@ -0,0 +1,12 @@ +diff -ur git-core-1.4.4/debian/examples/index.aux-generation git-core-1.4.4.mine/debian/examples/index.aux-generation +--- git-core-1.4.4/debian/examples/index.aux-generation 2006-11-24 17:59:27.000000000 -0500 ++++ git-core-1.4.4.mine/debian/examples/index.aux-generation 2006-11-24 18:01:12.000000000 -0500 +@@ -15,7 +15,7 @@ + for a in * ; do [ -r $a/public_git ] && [ ! -d /home/git/users/$a ] && ln -s /home/$a/public_git /home/git/users/$a ; done + + cd /home/git +-ls */HEAD users/*/*/HEAD | grep ^[-./=+a-zA-Z0-9]*\$ | sed s:/HEAD\$:: | while read DIR ; do ++find . -name 'HEAD' | grep ^[-./=+a-zA-Z0-9]*\$ | sed s:/HEAD\$:: | while read DIR ; do + TREEUID=`stat -c %U $DIR` + TREEUSERNAME=`grep ^$TREEUID: /etc/passwd | cut -f5 -d: | sed s/\ /+/` + if [ "$TREEUSERNAME" = "" ]; then --- git-core-1.4.4.2.orig/debian/diff/GNU-Hurd.diff +++ git-core-1.4.4.2/debian/diff/GNU-Hurd.diff @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index 36ce8cd..0c98df9 100644 +--- a/Makefile ++++ b/Makefile +@@ -400,6 +400,11 @@ ifeq ($(uname_S),NetBSD) + BASIC_LDFLAGS += -L/usr/pkg/lib + ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib + endif ++ifeq ($(uname_S),GNU) ++ # GNU stands for GNU/Hurd ++ NO_STRLCPY = YesPlease ++ ALL_CFLAGS += -DPATH_MAX=4096 ++endif + ifeq ($(uname_S),AIX) + NO_STRCASESTR=YesPlease + NO_STRLCPY = YesPlease --- git-core-1.4.4.2.orig/debian/diff/pager-vs-less.diff +++ git-core-1.4.4.2/debian/diff/pager-vs-less.diff @@ -0,0 +1,13 @@ +diff --git a/pager.c b/pager.c +index 4587fbb..f9d4387 100644 +--- a/pager.c ++++ b/pager.c +@@ -22,7 +22,7 @@ void setup_pager(void) + if (!pager) + pager = getenv("PAGER"); + if (!pager) +- pager = "less"; ++ pager = "pager"; + else if (!*pager || !strcmp(pager, "cat")) + return; + --- git-core-1.4.4.2.orig/debian/git-daemon-run.prerm +++ git-core-1.4.4.2/debian/git-daemon-run.prerm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || test "$1" = 'deconfigure' || \ + test "$1" = 'failed-upgrade' || exit 0 + +sv -w14 force-stop git-daemon || : + +test ! -h /var/service/git-daemon || rm -f /var/service/git-daemon --- git-core-1.4.4.2.orig/debian/changelog +++ git-core-1.4.4.2/debian/changelog @@ -0,0 +1,555 @@ +git-core (1:1.4.4.2-1build1) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + + -- Matthias Klose Mon, 5 Mar 2007 01:16:45 +0000 + +git-core (1:1.4.4.2-1) unstable; urgency=low + + * new upstream release. + * fixes FTBFS on m68k (thx Roman Zippel, closes: #402022). + * 0001-archive-zip-don-t-use-sizeof-struct.diff, + 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git log | git shortlog. + + -- Gerrit Pape Fri, 8 Dec 2006 19:13:49 +0000 + +git-core (1:1.4.4.1-1) unstable; urgency=low + + * new upstream release (closes: #400191). + * 0001-archive-zip-don-t-use-sizeof-struct.diff: new from upstream git; + replaces debian/diff/not-packed-structs.diff. + * 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: new from upstream + git. + * debian/diff/genindex.diff: new; support subdirs in gitweb example index + generator (thx David Nusinow; closes: #400284). + * debian/diff/GNU-Hurd.diff, debian/diff/pager-vs-less.diff: adapt. + + -- Gerrit Pape Sun, 26 Nov 2006 14:31:39 +0000 + +git-core (1:1.4.4-2) unstable; urgency=low + + * debian/diff/not-packed-structs.diff: new; don't use sizeof(struct ...), + size doesn't match on arm (fixes selftests failure on arm). + + -- Gerrit Pape Wed, 22 Nov 2006 23:31:11 +0000 + +git-core (1:1.4.4-1) unstable; urgency=low + + * new upstream release (closes: #399575). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/control: Build-Depends: unzip (for selftests). + + -- Gerrit Pape Tue, 21 Nov 2006 09:43:37 +0000 + +git-core (1:1.4.3.5-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 13 Nov 2006 17:46:50 +0000 + +git-core (1:1.4.3.3-2) unstable; urgency=medium + + * debian/git-daemon-run.postinst: don't make the log service system user + gitlog member of group adm, but nogroup; gitlog's home directory is + /nonexistent (thx Florian Weimer, closes: #396687). + * debian/git-daemon/log/run: make /var/log/git-daemon log directory mode + 2750, owner gitlog:adm. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 6 Nov 2006 20:12:08 +0000 + +git-core (1:1.4.3.3-1) unstable; urgency=low + + * new upstream release. + * debian/diff/0001-Set-HOME-for-selftests.diff: remove; applied upstream. + * debian/control: git-core: Depends: libdigest-sha1-perl (closes: #395304, + thx Ichthyostega). + + -- Gerrit Pape Tue, 31 Oct 2006 07:31:21 +0000 + +git-core (1:1.4.3.2-1) unstable; urgency=low + + * new upstream release. + * debian/diff/gitweb.conf.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/rules: add 'GITWEB_CONFIG=/etc/gitweb.conf mandir=/usr/share/man + OPTIMIZE="-O2 -g -Wall" INSTALLDIRS=vendor' to build OPTS, adapt paths; + git-arch: don't include git-archive, git-upload-archive; gitweb: install + git-logo.png, git-favicon.png; git-core: properly install new Git.pm + plus man page. + * debian/diff/0001-Set-HOME-for-selftests.diff: new; set $HOME for + selftests (fixes build/selftest failures). + * debian/control: git-core: Depends: liberror-perl. + + -- Gerrit Pape Tue, 24 Oct 2006 16:32:35 +0000 + +git-core (1:1.4.2.3-2) unstable; urgency=low + + * debian/control: new package git-daemon-run: provide a git-daemon + service; git-core: no longer Suggests: runit, Depends: adduser, the + git-daemon-run package now Depends: runit, adduser. + * debian/debian/git-core.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: new; manage gitlog user and git-daemon + service (closes: #388144). + * debian/git-core.postinst: no longer adduser gitlog, git-daemon-run + package does now. + * debian/git-core.postrm: remove; obsolete. + * debian/rules: install git-daemon service directory in the new + git-daemon-run package instead of the git-core package. + * debian/git-core.conffiles: rename to debian/git-daemon-run.conffiles. + * debian/git-core.README.Debian: adapt. + * debian/control: git-core: Suggests: git-daemon-run. + + -- Gerrit Pape Sun, 8 Oct 2006 09:29:50 +0000 + +git-core (1:1.4.2.3-1) unstable; urgency=medium + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/t3403-skip-3-7.diff: remove; git-am is fixed upstream. + * debian/gitweb.conf: add $stylesheet = "/gitweb.css" (thx Christian + Kujau, closes: #383065). + + -- Gerrit Pape Sun, 8 Oct 2006 07:31:03 +0000 + +git-core (1:1.4.2.1-1) unstable; urgency=low + + * new upstream release (closes: #386820, #387405). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/GNU-Hurd.diff: new; make the build process detect and + support the Debian GNU/Hurd architecture (thx Cyril Brulebois, closes: + #379841). + * debian/diff/GNU-kFreeBSD.diff: remove; applied upstream. + * debian/rules: gitweb: install gitweb.css into /var/www/ instead of + /usr/share/doc/gitweb/ (thx Matthijs Melchior, closes: #383065). + * debian/gitweb.docs: remove; obsolete. + * debian/examples/index.aux-generation: example script to generate an + optional index.aux file for the use with gitweb (thx Matthew Wilcox, + #383219). + * debian/gitweb.examples: new; install debian/examples/index.aux-generation + (#383219). + * debian/git-core.README.Debian: new; hints on how to set up a + git.example.org server providing git://, rsync://, http:// access to + repositories from Matthew Wilcox (thx!, closes: #383219). + * debian/gitweb.README.Debian: cleanup; refer to git-core.README.Debian. + * debian/control: git-svn: Depends: libsvn-perl | libsvn-core-perl (thx + Peter Samuelson); git-core, git-doc: Suggests: gitweb; gitweb: + Recommends: git-doc. + * debian/diff/pager-vs-less.diff, debian/diff/gitweb.conf.diff: adapt. + * debian/git-daemon/: new; git-daemon service directory for the use with + runit. + * debian/control: Build-Depends: subversion, libsvn-perl | libsvn-core-perl + (for git-svn selftests); git-core: Suggests: runit, Depends: adduser. + * debian/diff/t3403-skip-3-7.diff: new; skip selftests 3,7 in t3403 as + they fail without a terminal connected. + * debian/git-core.conffiles: new; add /etc/sv/git-daemon/run, + /etc/sv/git-daemon/log/run. + + -- Gerrit Pape Fri, 15 Sep 2006 12:46:58 +0000 + +git-core (1:1.4.1.1-1) unstable; urgency=low + + * new upstream release. + * debian/diff/GNU-kFreeBSD.diff: new; make the build process detect and + support the Debian GNU/kFreeBSD architecture (thx Petr Salinger, closes: + #380209). + + -- Gerrit Pape Sat, 29 Jul 2006 15:31:04 +0000 + +git-core (1:1.4.1-2) unstable; urgency=low + + * adopt package gitweb, now included in git-core upstream source (thx + Andres Salomon): + * debian/control, debian/rules: build gitweb package. + * debian/copyright: adapt. + * debian/gitweb.README.Debian, debian/gitweb.conf, debian/gitweb.docs: + new; taken from Andres' gitweb package. + * debian/diff/gitweb.conf.diff: new; adapt Andres' gitweb.conf.patch. + * debian/gitweb.conffiles: new; /etc/gitweb.conf. + * debian/changelog: use epoch 1 to supersede gitweb-264 package version. + * debian/rules: set DESTDIR in environment, not build flags. + + -- Gerrit Pape Thu, 27 Jul 2006 21:44:06 +0000 + +git-core (1.4.1-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/rules: user same build flags and prefix to $(MAKE) in build + and install target to prevent rebuild in install target. + + -- Gerrit Pape Tue, 11 Jul 2006 21:38:33 +0000 + +git-core (1.4.0-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: new; upstream changes taken from mailing + list announcement. + * debian/rules: install debian/changelog.upstream as upstream changelog. + * debian/diff/pager-vs-less.diff: adapt. + * debian/control: Standards-Version: 3.7.2.0. + + -- Gerrit Pape Wed, 14 Jun 2006 17:04:56 +0000 + +git-core (1.3.3-2) unstable; urgency=medium + + * debian/control: git-core: Depends: perl-modules (closes: #369737). + * debian/diff/pager-vs-less.diff: new; fallback to `pager` not `less` + if $PAGER is unset (closes: #369742). + + -- Gerrit Pape Sat, 10 Jun 2006 11:18:48 +0000 + +git-core (1.3.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Thu, 25 May 2006 10:46:00 +0000 + +git-core (1.3.2-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Wed, 10 May 2006 20:41:39 +0000 + +git-core (1.3.1-1) unstable; urgency=low + + * new upstream release (closes: #364678). + * debian/rules: install contrib/ directory into /usr/share/doc/git-core/. + + -- Gerrit Pape Mon, 1 May 2006 13:01:42 +0000 + +git-core (1.2.6-1) unstable; urgency=low + + * new upstream release. + * debian/control: git-cvs: Depends: cvsps (>> 2.1-0). + + -- Gerrit Pape Sun, 16 Apr 2006 14:37:53 +0000 + +git-core (1.2.4-1) unstable; urgency=low + + * new upstream release (closes: #354563). + + -- Gerrit Pape Fri, 3 Mar 2006 21:33:58 +0000 + +git-core (1.2.1-1) unstable; urgency=low + + * new upstream release (closes: #353041). + * debian/control: git-core: Recommends: ssh-client instead of + openssh-client (closes: #350708). + + -- Gerrit Pape Thu, 16 Feb 2006 09:33:42 +0000 + +git-core (1.1.5-1) unstable; urgency=high + + * new upstream release. + * checkout: do not make a temporary copy of symlink target. + If the index records an insanely long symbolic link, copying + into the temporary would overflow the buffer (noticed by Mark + Wooding). (closes: #350274). + + -- Gerrit Pape Sat, 28 Jan 2006 20:16:44 +0000 + +git-core (1.1.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Mon, 16 Jan 2006 10:19:37 +0000 + +git-core (1.0.8-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-lisge-order.sh.diff: remove; applied upstream. + * debian/control: Build-Depends: libcurl3-gnutls-dev | libcurl3-dev, + python, asciidoc (>> 7.0.2-3) (ease backport to sarge, thx Norbert + Tretkowski, closes: #344929). + + -- Gerrit Pape Mon, 9 Jan 2006 19:19:36 +0000 + +git-core (1.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-list-merge-order.sh.diff: new: fix skipping + merge-order test with NO_OPENSSL=1. + * debian/rules: re-enable git-rev-list --merge-order selftests. + * debian/control: git-svn: Depends: libwww-perl (closes: #345045). + + -- Gerrit Pape Mon, 2 Jan 2006 20:25:57 +0000 + +git-core (1.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: don't take upstream changelog from upstream + debian/changelog. + * debian/changelog.upstream: remove again. + + -- Gerrit Pape Tue, 27 Dec 2005 13:25:53 +0000 + +git-core (1.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: new: upstream changelog taken from upstream + debian/changelog. + * debian/rules: install debian/changelog.upstream as upstream changelog; + remove obsolete VERSION variable. + + -- Gerrit Pape Fri, 23 Dec 2005 14:58:14 +0000 + +git-core (1.0.0-1) unstable; urgency=medium + + * new upstream release: GIT 1.0.0. + + -- Gerrit Pape Wed, 21 Dec 2005 16:17:18 +0000 + +git-core (0.99.9n-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9n aka 1.0rc6. + * debian/rules: rename git program in git-core package to git-scm, + handle /usr/bin/git program through update-alternatives (as suggested + by Ian Beckwith, see #342363). + * debian/control: git-core: Conflicts: git (<< 4.3.20-8) (closes: + #342363). + * debian/git-core.postinst, debian/git-core.prerm: new: run + update-alternatives --install /usr/bin/git git /usr/bin/git-scm with + priority 70 on configure, and --remove on remove respectively. + + -- Gerrit Pape Thu, 15 Dec 2005 11:24:51 +0000 + +git-core (0.99.9m-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9m aka 1.0rc5. + * sets PYTHONPATH for selftests (fixes autobuild test failures). + * switch from tarball-in-tarball approach to original upstream tarball. + * debian/changelog: add changelog history, Junio C Hamano, Ryan Anderson, + Eric Biederman previously were maintaining this package unofficially. + * debian/control: Build-Depends: rcs (for selftests); git-core: + Recommends: patch, less, Suggests: cogito; git-arch: Suggests: tla, + bazzar; git-cvs: Depends: cvsps, Suggests: cvs; git-svn: Depends: + libsvn-core-perl (closes:#342617), Suggests: subversion; git-email: + Depends: libmail-sendmail-perl, libemail-valod-perl; update short + description (lots taken from upstream unofficial package, thx). + * debian/git-core.docs, debian/git-doc.docs: adapt. + * debian/rules: adapt; remove target unpack; add target patch; adapt + target clean. + + -- Gerrit Pape Wed, 14 Dec 2005 19:48:41 +0000 + +git-core (0.99.9l-1) unstable; urgency=low + + * new upstream version. + * debian/rules: apply diffs with patch -p1. + * debian/control, debian/rules: split off git-arch, git-cvs, git-svn, + git-email packages, as suggested by upstream: + http://article.gmane.org/gmane.comp.version-control.git/13185 + * debian/git-doc.docs: get docs from temporary install directory; + include *.txt docs. + * debian/control: git-doc: Section: doc; Suggests: git-core, git-arch, + git-cvs, git-svn, git-email, gitk; git-core: Suggests: git-arch, + git-cvs, git-svn, git-email, gitk. + + -- Gerrit Pape Mon, 5 Dec 2005 18:04:37 +0000 + +git-core (0.99.9k-1) unstable; urgency=low + + * new upstream version. + * debian/implicit: update to revision 1.11. + * debian/git-doc.docs: add git/Documentation/howto, + git/Documentation/technical (closes: #341178). + + -- Gerrit Pape Tue, 29 Nov 2005 21:45:53 +0000 + +git-core (0.99.9j-1) unstable; urgency=low + + * initial version. + * debian/control: git-core: Replaces: cogito (<< 0.16rc2-0); cogito >= + 0.16rc2-0 no longer includes the git core components, but depends on + the git-core package (see #338789). + + -- Gerrit Pape Fri, 18 Nov 2005 22:26:36 +0000 + +git-core (0.99.9j-0) unstable; urgency=low + + * GIT 0.99.9j aka 1.0rc3 + + -- Junio C Hamano Wed, 16 Nov 2005 20:39:55 -0800 + +git-core (0.99.9i-0) unstable; urgency=low + + * GIT 0.99.9i aka 1.0rc2 + + -- Junio C Hamano Mon, 14 Nov 2005 18:38:27 -0800 + +git-core (0.99.9h-0) unstable; urgency=low + + * GIT 0.99.9h + + -- Junio C Hamano Fri, 11 Nov 2005 22:33:18 -0800 + +git-core (0.99.9g-0) unstable; urgency=low + + * GIT 0.99.9g + + -- Junio C Hamano Wed, 9 Nov 2005 21:01:55 -0800 + +git-core (0.99.9f-0) unstable; urgency=low + + * GIT 0.99.9f + + -- Junio C Hamano Tue, 8 Nov 2005 01:21:52 -0800 + +git-core (0.99.9e-0) unstable; urgency=low + + * GIT 0.99.9e + + -- Junio C Hamano Sun, 6 Nov 2005 18:37:18 -0800 + +git-core (0.99.9d-0) unstable; urgency=low + + * GIT 0.99.9d + + -- Junio C Hamano Sat, 5 Nov 2005 11:46:37 -0800 + +git-core (0.99.9c-0) unstable; urgency=low + + * GIT 0.99.9c + + -- Junio C Hamano Thu, 3 Nov 2005 15:44:54 -0800 + +git-core (0.99.9b-0) unstable; urgency=low + + * GIT 0.99.9b + + -- Junio C Hamano Tue, 1 Nov 2005 21:39:39 -0800 + +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano Sun, 30 Oct 2005 15:03:32 -0800 + +git-core (0.99.9.GIT-2) unstable; urgency=low + + * Build Dependency did not include libexpat-dev. + + -- Junio C Hamano Sun, 13 Nov 2005 01:55:34 -0800 + +git-core (0.99.9.GIT-1) unstable; urgency=low + + * Do not scatter txt and html documentation into feature + subpackages. Do place man pages into them. + * Capture more cvs stuff into git-cvs package. + + -- Junio C Hamano Tue, 8 Nov 2005 01:19:06 -0800 + +git-core (0.99.9.GIT-0) unstable; urgency=low + + * Test Build. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-1) unstable; urgency=low + + * Split the git-core binary package into core, doc, and foreign SCM + interoperability modules. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-0) unstable; urgency=low + + * GIT 0.99.9 + + -- Junio C Hamano Sat, 29 Oct 2005 14:34:30 -0700 + +git-core (0.99.8-0) unstable; urgency=low + + * GIT 0.99.8 + + -- Junio C Hamano Sun, 2 Oct 2005 12:54:26 -0700 + +git-core (0.99.7-0) unstable; urgency=low + + * GIT 0.99.7 + + -- Junio C Hamano Sat, 10 Sep 2005 18:36:39 -0700 + +git-core (0.99.6-0) unstable; urgency=low + + * GIT 0.99.6 + + -- Junio C Hamano Wed, 24 Aug 2005 23:09:35 -0700 + +git-core (0.99.5-1) unstable; urgency=low + + * Enable git-send-email on Debian. There is no reason to shy + away from it, since we have the necessary Perl modules available. + + -- Junio C Hamano Thu, 25 Aug 2005 14:16:59 -0700 + +git-core (0.99.5-0) unstable; urgency=low + + * GIT 0.99.5 + + -- Junio C Hamano Wed, 10 Aug 2005 22:05:00 -0700 + +git-core (0.99.4-4) unstable; urgency=low + + * Mark git-tk as architecture neutral. + + -- Junio C Hamano Fri, 12 Aug 2005 13:25:00 -0700 + +git-core (0.99.4-3) unstable; urgency=low + + * Split off gitk. + * Do not depend on diff which is an essential package. + * Use dh_movefiles, not dh_install, to stage two subpackages. + + -- Matthias Urlichs Thu, 11 Aug 2005 01:43:24 +0200 + +git-core (0.99.4-2) unstable; urgency=low + + * Git 0.99.4 official release. + + -- Junio C Hamano Wed, 10 Aug 2005 15:00:00 -0700 + +git-core (0.99.4-1) unstable; urgency=low + + * Pass prefix down to the submake when building. + + -- Junio C Hamano Sat, 6 Aug 2005 13:00:00 -0700 + +git-core (0.99-2) unstable; urgency=low + + * Conflict with the GNU Interactive Tools package, which also installs + /usr/bin/git. + * Use the Mozilla SHA1 code and/or the PPC assembly in preference to + OpenSSL. This is only a partial fix for the license issues with OpenSSL. + * Minor tweaks to the Depends. + + -- Ryan Anderson Sat, 23 Jul 2005 14:15:00 -0400 + +git-core (0.99-1) unstable; urgency=low + + * Update deb package support to build correctly. + + -- Ryan Anderson Thu, 21 Jul 2005 02:03:32 -0400 + +git-core (0.99-0) unstable; urgency=low + + * Initial deb package support + + -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 --- git-core-1.4.4.2.orig/debian/changelog.upstream +++ git-core-1.4.4.2/debian/changelog.upstream @@ -0,0 +1,3321 @@ +Subject: What's in git.git (stable) +From: Junio C Hamano +Date: 2006-12-06 21:18:26 + +* The 'maint' branch has produced a new release 1.4.4.2 + +---------------------------------------------------------------- + +Changes since v1.4.4.1 are as follows: + +Alex Riesen (1): + git-blame: fix rev parameter handling. + +Andy Parkins (2): + Increase length of function name buffer + Document git-repo-config --bool/--int options. + +Eric Wong (4): + git-svn: error out from dcommit on a parent-less commit + git-svn: correctly handle revision 0 in SVN repositories + git-svn: preserve uncommitted changes after dcommit + git-svn: avoid fetching files twice in the same revision + +Johannes Schindelin (1): + git-mv: search more precisely for source directory in index + +Junio C Hamano (5): + git blame -C: fix output format tweaks when crossing file boundary. + tutorial: talk about user.name early and don't start with commit -a + receive-pack: do not insist on fast-forward outside refs/heads/ + unpack-trees: make sure "df_conflict_entry.name" is NUL terminated. + git-reset to remove "$GIT_DIR/MERGE_MSG" + +René Scharfe (1): + archive-zip: don't use sizeof(struct ...) + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.4.1 +From: Junio C Hamano +Date: 2006-11-23 2:49:28 + +The latest maintenance release GIT 1.4.4.1 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.4.1.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.4.1.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.4.1.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.4.1-1.$arch.rpm (RPM) + +This contains mostly small post-release fixups. + +---------------------------------------------------------------- + +Changes since v1.4.4 are as follows: + +Alexandre Julliard (1): + gitweb: Put back shortlog instead of graphiclog in the project list. + +Chris Riddoch (1): + Move --pretty options into Documentation/pretty-formats.txt + +Jim Meyering (1): + Run "git repack -a -d" once more at end, if there's 1MB or more of +not-packed data. + +Johannes Schindelin (1): + Seek back to current filepos when mmap()ing with NO_MMAP + +Junio C Hamano (7): + git-checkout: do not allow -f and -m at the same time. + git-checkout: allow pathspec to recover lost working tree directory + convert-objects: set _XOPEN_SOURCE to 600 + git-fetch: follow lightweit tags as well. + do_for_each_ref: perform the same sanity check for leftovers. + trust-executable-bit: fix breakage for symlinks + GIT 1.4.4.1 + +Linus Torvalds (2): + git-pull: allow pulling into an empty repository + "git fmt-merge-msg" SIGSEGV + +Michal Rokos (1): + archive: use setvbuf() instead of setlinebuf() + +Paolo Ciarrocchi (2): + Teach SubmittingPatches about git-commit -s + Doc: Make comment about merging in tutorial.txt more clear + +Petr Baudis (4): + Fix git-for-each-refs broken for tags + git-apply: Documentation typo fix + Documentation: Define symref and update HEAD description + Documentation: Correct alternates documentation, document +http-alternates + +Rene Scharfe (4): + sparse fix: non-ANSI function declaration + sparse fix: Using plain integer as NULL pointer + git-apply: slightly clean up bitfield usage + Document git-runstatus + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.4 +From: Junio C Hamano +Date: 2006-11-15 7:43:17 + +The latest feature release GIT 1.4.4 is available at the usual +places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.4.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.4.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.4.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.4-1.$arch.rpm (RPM) + +Quite a lot of changes during the last month. + + - pack-refs, along with a lot of internal clean-up of the code + that deal with refs, is in. A repository with many tags + would benefit from packing and pruning them. Currently dumb + transports are not capable of fetching from a repository that + has packed and pruned its refs, so please keep that in mind. + Hopefully we will get an update for dumb transports shortly. + + - git native transport can now keep transferred packs without + exploding it into loose objects. Also "git repack" can be + told to keep "historical" packs from getting repacked by + marking them with .keep file. Docmentation update is + probably needed. + + - git-blame can now detect line movements across files. No, it + is not called git-pickaxe. + + - a lot of gitweb and git-svn updates. + +---------------------------------------------------------------- + +Changes since v1.4.3 are as follows: + +Alan Chandler: + Gitweb - provide site headers and footers + +Alex Riesen: + merge-recursive implicitely depends on trust_executable_bit + +Alexandre Julliard: + git.el: Added a function to open the current file in another window. + git.el: Added functions for moving to the next/prev unmerged file. + git.el: Include MERGE_MSG in the log-edit buffer even when not +committing + git.el: Move point after the log message header when entering log-edit +mod + pack-refs: Store the full name of the ref even when packing only tags. + prune-packed: Fix uninitialized variable. + +Andy Parkins: + git-clone documentation didn't mention --origin as equivalent of -o + Make filenames line up in git-status output + Minor grammar fixes for git-diff-index.txt + Remove uneccessarily similar printf() from print_ref_list() in +builtin-bra + +Andy Whitcroft: + cvsimport: move over to using git-for-each-ref to read refs. + git-for-each-ref: improve the documentation on scripting modes + +Aneesh Kumar K.V: + gitweb: Remove extra "/" in path names for git_get_project_list + +Christian Couder: + Add pack-refs and show-ref test cases. + Add [-s|--hash] option to Linus' show-ref. + Check that a tag exists using show-ref instead of looking for the ref +file + Clean up "git-branch.sh" and add remove recursive dir test cases. + Documentation: add git in /etc/services. + Documentation: add upload-archive service to git-daemon. + Document git-show-ref [-s|--hash] option. + Do not create tag leading directories since git update-ref does it. + Fix a remove_empty_dir_recursive problem. + Fix show-ref usage for --dereference. + Remove --syslog in git-daemon inetd documentation examples. + Uncomment test case: git branch c/d should barf if branch c exists. + Use git-update-ref to delete a tag instead of rm()ing the ref file. + Use Linus' show ref in "git-branch.sh". + When creating branch c/d check that branch c does not already exists. + +Dennis Stosberg: + lock_ref_sha1_basic does not remove empty directories on BSD + Remove bashism from t3210-pack-refs.sh + Bash completion support for aliases + +Dmitry V. Levin: + git-clone: define die() and use it. + +Edgar Toernig: + Use memmove instead of memcpy for overlapping areas + +Eric Wong: + git-send-email: do not pass custom Date: header + git-svn: avoid printing filenames of files we're not tracking + git-svn: don't die on rebuild when --upgrade is specified + git-svn: fix dcommit losing changes when out-of-date from svn + git-svn: fix symlink-to-file changes when using command-line svn 1.4.0 + +Gerrit Pape: + Set $HOME for selftests + +J. Bruce Fields: + Make prune also run prune-packed + Documentation: updates to "Everyday GIT" + +Jakub Narebski: + diff-format.txt: Combined diff format documentation supplement + diff-format.txt: Correct information about pathnames quoting in patch +form + Documentation: Transplanting branch with git-rebase --onto + Documentation: Update information about in git-for-each-ref + gitweb: Add "next" link to commitdiff view + gitweb: Add '..' (up directory) to tree view if applicable + gitweb: Better git-unquoting and gitweb-quoting of pathnames + gitweb: Better support for non-CSS aware web browsers + gitweb: Check git base URLs before generating URL from it + gitweb: Do not esc_html $basedir argument to git_print_tree_entry + gitweb: Filter out commit ID from @difftree in git_commit and +git_commitdi + gitweb: Get rid of git_print_simplified_log + gitweb: Improve git_print_page_path + gitweb: Move git_get_last_activity subroutine earlier + gitweb: New improved patchset view + gitweb: Output also empty patches in "commitdiff" view + gitweb: Print commit message without title in commitdiff only if there +is + gitweb: Secure against commit-ish/tree-ish with the same name as path + gitweb: Use character or octal escape codes (and add span.cntrl) in +esc_pa + gitweb: Use git-for-each-ref to generate list of heads and/or tags + gitweb: Use --no-commit-id in git_commit and git_commitdiff + gitweb: Use 's' regexp modifier to secure against filenames with LF + gitweb: Whitespace cleanup - tabs are for indent, spaces are for align +(2) + +Jan Harkes: + Continue traversal when rev-list --unpacked finds a packed commit. + +Jeff King: + wt-status: use simplified resolve_ref to find current branch + gitignore: git-pack-refs is a generated file. + gitignore: git-show-ref is a generated file. + git-pickaxe: work properly in a subdirectory. + Fix git-runstatus for repositories containing a file named HEAD + +Jim Meyering: + Don't use $author_name undefined when $from contains no /\s,+N" + git-pickaxe: blame rewritten. + git-pickaxe: cache one already found path per commit. + git-pickaxe -C: blame cut-and-pasted lines. + git-pickaxe: do not confuse two origins that are the same. + git-pickaxe: do not keep commit buffer. + git-pickaxe: fix nth_line() + git-pickaxe: fix origin refcounting + git-pickaxe: get rid of wasteful find_origin(). + git-pickaxe: improve "best match" heuristics + git-pickaxe: introduce heuristics to avoid "trivial" chunks + git-pickaxe: -L /regexp/,/regexp/ + git-pickaxe -M: blame line movements within a file. + git-pickaxe: optimize by avoiding repeated read_sha1_file(). + git-pickaxe: pagenate output by default. + git-pickaxe: refcount origin correctly in find_copy_in_parent() + git-pickaxe: rename detection optimization + git-pickaxe: re-scan the blob after making progress with -C + git-pickaxe: re-scan the blob after making progress with -M + git-pickaxe: retire pickaxe + git-pickaxe: simplify Octopus merges further + git-pickaxe: split find_origin() into find_rename() and find_origin(). + git-pickaxe: swap comparison loop used for -C + git-pickaxe: tighten sanity checks. + git-pickaxe: WIP to refcount origin structure. + git-repack: repo.usedeltabaseoffset + git-send-email: do not drop custom headers the user prepared + git-send-email: real name with period need to be dq-quoted on From: line + git-status: quote LF in its output + gitweb: do not give blame link unconditionally in diff-tree view + gitweb: fix disabling of "forks" + gitweb: fix unmatched div in commitdiff + gitweb: make leftmost column of blame less cluttered. + gitweb: minimally fix "fork" support. + gitweb: prepare for repositories with packed refs. + gitweb: protect blob and diff output lines from controls. + gitweb: protect commit messages from controls. + gitweb: spell "blame --porcelain" with -p + gitweb: use blame --porcelain + gitweb: use for-each-ref to show the latest activity across branches + grep --all-match + Introduce a new revision set operator ^! + link_temp_to_file: don't leave the path truncated on adjust_shared_perm +fa + lock_ref_sha1_basic: remove unused parameter "plen". + lock_ref_sha1(): check D/F conflict with packed ref when creating. + lock_ref_sha1(): do not sometimes error() and sometimes die(). + Make git-send-email detect mbox-style patches more readily + merge: loosen overcautious "working file will be lost" check. + merge-recursive: adjust to loosened "working file clobbered" check + merge-recursive: make a few functions static. + merge-recursive: use abbreviated commit object name. + pack-objects: document --delta-base-offset option + pack-refs: call fflush before fsync. + pack-refs: do not pack symbolic refs. + pack-refs: fix git_path() usage. + pack-refs: use lockfile as everybody else does. + pager: default to LESS=FRS + pager: default to LESS=FRSX not LESS=FRS + path-list: fix path-list-insert return value + quote.c: ensure the same quoting across platforms. + receive-pack: call setup_ident before git_config + Refer to git-rev-parse:Specifying Revisions from git.txt + ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore. + ref-log: allow ref@{count} syntax. + ref-log: fix D/F conflict coming from deleted refs. + refs: minor restructuring of cached refs data. + Revert 954a6183756a073723a7c9fd8d2feb13132876b0 + Revert "send-pack --keep: do not explode into loose objects on the +receivi + revision traversal: --unpacked does not limit commit list anymore. + RPM package re-classification. + send-pack --keep: do not explode into loose objects on the receiving +end. + sha1_name.c: avoid compilation warnings. + show-ref --hash=len, --abbrev=len, and --abbrev + Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif" + symbolit-ref: fix resolve_ref conversion. + t3200: git-branch testsuite update + t6022: ignoring untracked files by merge-recursive when they do not +matter + Teach receive-pack about ref-log + teach revision walker about --all-match. + Tell between packed, unpacked and symbolic refs. + tests: merge-recursive is usable without Python + update a few Porcelain-ish for ref lock safety. + Update cherry documentation. + update-ref: -d flag and ref creation safety. + +Karl Hasselstr?m: + git-vc: better installation instructions + ignore-errors requires cl + +Lars Hjemli: + Fix typo in show-index.c + Fix usagestring for git-branch + Make git-branch a builtin + Fix show-ref usagestring + +Linus Torvalds: + Add "git show-ref" builtin command + Teach "git checkout" to use git-show-ref + Start handling references internally as a sorted in-memory list + Add support for negative refs + Make ref resolution saner + Enable the packed refs file format + git-apply: prepare for upcoming GNU diff -u format change. + Allow '-' in config variable names + git push: add verbose flag and allow overriding of default target +reposito + +Luben Tuikov: + gitweb: blame: print commit-8 on the leading row of a commit-block + gitweb: blame: Mouse-over commit-8 shows author and date + gitweb: blame porcelain: lineno and orig lineno swapped + git-revert with conflicts to behave as git-merge with conflicts + gitweb: esc_html() author in blame + +Martin Waitz: + gitweb: start to generate PATH_INFO URLs. + gitweb: warn if feature cannot be overridden. + +Matthew Wilcox: + Add --dry-run option to git-send-email + +Nguy?n Th?i Ng?c Duy: + Reject hexstring longer than 40-bytes in get_short_sha1() + Add revspec documentation for ':path', ':[0-3]:path' and git-describe + +Nicolas Pitre: + introduce delta objects with offset to base + teach git-unpack-objects about deltas with offset to base + teach git-index-pack about deltas with offset to base + make git-pack-objects able to create deltas with offset to base + make pack data reuse compatible with both delta types + let the GIT native protocol use offsets to delta base when possible + zap a debug remnant + allow delta data reuse even if base object is a preferred base + index-pack: compare only the first 20-bytes of the key. + reduce delta head inflated size + add the capability for index-pack to read from a stream + enable index-pack streaming capability + make index-pack able to complete thin packs. + add progress status to index-pack + mimic unpack-objects when --stdin is used with index-pack + enhance clone and fetch -k experience + index-pack: minor fixes to comment and function name + missing small substitution + pack-objects doesn't create random pack names + make git-push a bit more verbose + Allow pack header preprocessing before unpack-objects/index-pack. + git-fetch can use both --thin and --keep with fetch-pack now + improve fetch-pack's handling of kept packs + have index-pack create .keep file more carefully + remove .keep pack lock files when done with refs update + git-pack-objects progress flag documentation and cleanup + +OGAWA Hirofumi: + gitk: Fix nextfile() and add prevfile() + +Petr Baudis: + Fix broken sha1 locking + Fix buggy ref recording + gitweb: Document features better + gitweb: Fix search form when PATH_INFO is enabled + bisect reset: Leave the tree in usable state if git-checkout failed + gitweb: Fix setting $/ in parse_commit() + gitweb: Restore object-named links in item lists + gitweb: Make search type a popup menu + gitweb: Do not automatically append " git" to custom site name + gitweb: Show project's README.html if available + xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of +l + gitweb: Support for 'forks' + gitweb: Fix up bogus $stylesheet declarations + Nicer error messages in case saving an object to db goes wrong + +Rene Scharfe: + git-archive --format=zip: use default version ID + git-archive --format=zip: add symlink support + git-merge: show usage if run without arguments + Built-in cherry + Make git-cherry handle root trees + git-cherry: document limit and add diagram + +Robert Shearman: + git-rebase: Use --ignore-if-in-upstream option when executing +git-format-p + git-rebase: Add a -v option to show a diffstat of the changes upstream +at + git-rebase: Use --ignore-if-in-upstream option when executing +git-format-p + +Robin Rosenberg: + Mention that pull can work locally in the synopsis + Swap the porcelain and plumbing commands in the git man page + Rework cvsexportcommit to handle binary files for all cases. + +Ryan Anderson: + Remove git-annotate.perl and create a builtin-alias for git-blame + +Santi B?jar: + fetch: Misc output cleanup + merge and resolve: Output short hashes and .. in "Updating ..." + Documentation for the [remote] config + +Sasha Khapyorsky: + git-svnimport.perl: copying directory from original SVN place + git-svnimport: support for partial imports + +Sean Estabrooks: + Add --global option to git-repo-config. + +Sergey Vlasov: + git-send-email: Document support for local sendmail instead of SMTP +server + git-send-email: Read the default SMTP server from the GIT config file + +Shawn Pearce: + Added completion support for git-branch.exe. + Added bash completion support for git-reset. + Use ULONG_MAX rather than implicit cast of -1. + Remove SIMPLE_PROGRAMS and make git-daemon a normal program. + Remove unsupported C99 style struct initializers in git-archive. + Added missing completions for show-branch and merge-base. + Only load .exe suffix'd completions on Cygwin. + Bash completion support for remotes in .git/config. + Take --git-dir into consideration during bash completion. + Support bash completion on symmetric difference operator. + Remove more sed invocations from within bash completion. + Use column indexes in git-cvsserver where necessary. + Allow short pack names to git-pack-objects --unpacked=. + Only repack active packs by skipping over kept packs. + Teach git-index-pack how to keep a pack file. + Remove unused variable in receive-pack. + Move deny_non_fast_forwards handling completely into receive-pack. + Teach receive-pack how to keep pack files based on object count. + +Tero Roponen: + remove an unneeded test + +Tuncer Ayaz: + git-fetch.sh printed protocol fix + + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.3 +From: Junio C Hamano +Date: 2006-10-18 23:53:22 + +The latest feature release GIT 1.4.3 is available at the usual +places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.3.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.3.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.3.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.3-1.$arch.rpm (RPM) + +Please holler if i386 RPMs are broken, since they are not cut on +the machine I am used to use (I ended up burning half a day +installing and futzing with FC5 on my older laptop resurrected +from the boneyard). + +User visible changes, other than bugfixes, since v1.4.2.4 are: + + - upload-tar is deprecated but not removed; we now have + upload-archive --format=tar and --format=zip instead. + + - ftp:// protocol is supported the same way as http:// and + https:// + + - git-diff paginates its output to the tty by default. If this + irritates you, using LESS=RF might help. + + - git-cherry-pick does not leave often useless "cherry-picked + from" message. + + - git-merge-recursive was replaced by a rewritten implemention + in C. The original Python implementation is available as + "recursive-old" strategy for now, but hopefully we can remove + it in the next cycle. + + - git-daemon can do name based virtual hosting. + + - git-daemon can serve tar and zip snapshots. + + - many gitweb tweaks and cleanups. + + - git-apply --reverse, --reject. + + - git-diff --color highlights whitespace errors. + + - git-diff --stat can be taught to use non-default widths. + + - git-status can use colors. + + - many more commands are built-in. + +---------------------------------------------------------------- + + .gitignore | 10 +- + Documentation/Makefile | 4 +- + Documentation/asciidoc.conf | 1 + + Documentation/config.txt | 34 + + Documentation/core-tutorial.txt | 2 +- + Documentation/cvs-migration.txt | 2 +- + Documentation/diff-options.txt | 10 +- + Documentation/git-apply.txt | 69 +- + .../{git-tar-tree.txt => git-archive.txt} | 93 +- + Documentation/git-blame.txt | 29 +- + Documentation/git-cherry-pick.txt | 23 +- + Documentation/git-daemon.txt | 135 +- + Documentation/git-grep.txt | 15 +- + Documentation/git-http-push.txt | 2 +- + Documentation/git-init-db.txt | 4 + + Documentation/git-ls-remote.txt | 18 +- + Documentation/git-pack-objects.txt | 26 +- + Documentation/git-receive-pack.txt | 2 + + Documentation/git-repack.txt | 13 +- + Documentation/git-repo-config.txt | 3 +- + Documentation/git-rev-list.txt | 428 ++- + Documentation/git-rev-parse.txt | 2 +- + Documentation/git-send-pack.txt | 2 +- + Documentation/git-shortlog.txt | 17 +- + Documentation/git-svn.txt | 399 ++- + Documentation/git-tar-tree.txt | 3 + + Documentation/git-unpack-objects.txt | 8 +- + Documentation/git-update-index.txt | 4 +- + .../{git-upload-tar.txt => git-upload-archive.txt} | 24 +- + Documentation/git.txt | 37 +- + Documentation/gitk.txt | 151 +- + Documentation/glossary.txt | 4 +- + Documentation/hooks.txt | 56 +- + Documentation/technical/racy-git.txt | 193 + + Documentation/tutorial-2.txt | 2 +- + GIT-VERSION-GEN | 2 +- + INSTALL | 15 +- + Makefile | 297 +- + builtin-tar-tree.c => archive-tar.c | 229 +- + archive-zip.c | 333 ++ + archive.h | 47 + + blame.c | 19 +- + builtin-apply.c | 708 +++- + builtin-archive.c | 263 ++ + builtin-cat-file.c | 40 +- + checkout-index.c => builtin-checkout-index.c | 29 +- + builtin-commit-tree.c | 2 +- + builtin-count.c => builtin-count-objects.c | 2 +- + builtin-diff-files.c | 7 - + builtin-diff-stages.c | 2 +- + builtin-diff.c | 16 +- + builtin-fmt-merge-msg.c | 39 +- + builtin-grep.c | 650 +--- + builtin-init-db.c | 1 + + builtin-log.c | 7 +- + builtin-ls-files.c | 27 +- + builtin-ls-tree.c | 6 +- + builtin-mailinfo.c | 17 +- + builtin-mv.c | 12 +- + name-rev.c => builtin-name-rev.c | 8 +- + pack-objects.c => builtin-pack-objects.c | 439 ++- + builtin-prune-packed.c | 2 +- + builtin-prune.c | 4 +- + builtin-push.c | 32 +- + builtin-read-tree.c | 865 +---- + builtin-repo-config.c | 34 +- + builtin-rev-list.c | 171 +- + builtin-rev-parse.c | 10 +- + builtin-rm.c | 2 +- + builtin-runstatus.c | 36 + + builtin-show-branch.c | 18 +- + symbolic-ref.c => builtin-symbolic-ref.c | 8 +- + builtin-tar-tree.c | 439 +-- + unpack-objects.c => builtin-unpack-objects.c | 78 +- + builtin-update-index.c | 18 +- + builtin-update-ref.c | 2 +- + builtin-upload-archive.c | 175 + + builtin-upload-tar.c | 74 - + verify-pack.c => builtin-verify-pack.c | 15 +- + builtin-write-tree.c | 4 +- + builtin.h | 86 +- + cache-tree.c | 14 +- + cache.h | 68 +- + check-racy.c | 28 + + color.c | 176 + + color.h | 12 + + combine-diff.c | 41 +- + commit.c | 51 +- + commit.h | 2 +- + compat/inet_pton.c | 220 + + config.c | 18 +- + config.mak.in | 18 + + configure.ac | 561 ++- + connect.c | 50 +- + contrib/completion/git-completion.bash | 324 ++ + contrib/emacs/git.el | 4 +- + contrib/emacs/vc-git.el | 6 +- + contrib/gitview/gitview.txt | 56 +- + contrib/vim/README | 8 + + contrib/vim/syntax/gitcommit.vim | 18 + + convert-objects.c | 8 +- + csum-file.c | 6 +- + daemon.c | 431 ++- + date.c | 132 +- + describe.c | 14 +- + diff-delta.c | 4 +- + diff-lib.c | 32 +- + diff.c | 666 ++- + diff.h | 15 +- + diffcore-break.c | 2 +- + diffcore-rename.c | 2 +- + dir.c | 48 +- + dir.h | 1 + + dump-cache-tree.c | 2 +- + entry.c | 4 +- + environment.c | 20 +- + exec_cmd.c | 20 +- + fetch-clone.c | 33 +- + fetch-pack.c | 24 +- + fetch.c | 9 +- + fsck-objects.c | 44 +- + generate-cmdlist.sh | 1 + + git-branch.sh | 10 + + git-checkout.sh | 9 +- + git-cherry.sh | 3 - + git-clone.sh | 8 +- + git-commit.sh | 582 +-- + git-compat-util.h | 18 +- + git-cvsexportcommit.perl | 2 +- + git-cvsserver.perl | 65 +- + git-fetch.sh | 26 +- + git-ls-remote.sh | 6 +- + ...erge-recursive.py => git-merge-recursive-old.py | 0 + git-merge.sh | 5 +- + git-parse-remote.sh | 43 +- + git-pull.sh | 2 +- + git-rebase.sh | 6 +- + git-repack.sh | 25 +- + git-reset.sh | 3 - + git-resolve.sh | 4 + + git-revert.sh | 14 +- + git-send-email.perl | 42 +- + git-shortlog.perl | 44 +- + git-svn.perl | 122 +- + git-svnimport.perl | 35 +- + git.c | 131 +- + git.spec.in | 23 +- + gitk | 682 +++- + gitweb/README | 61 +- + gitweb/git-favicon.png | Bin + gitweb/git-logo.png | Bin + gitweb/gitweb.css | 80 +- + gitweb/{gitweb.cgi => gitweb.perl} | 4459 +++++++++++++-------- + grep.c | 498 +++ + grep.h | 79 + + builtin-help.c => help.c | 4 +- + http-fetch.c | 303 +-- + http-push.c | 95 +- + http.c | 12 + + http.h | 4 + + imap-send.c | 45 +- + index-pack.c | 16 +- + interpolate.c | 108 + + interpolate.h | 26 + + builtin-prune.c => list-objects.c | 255 +- + list-objects.h | 12 + + local-fetch.c | 8 +- + log-tree.c | 82 +- + merge-base.c | 2 +- + merge-file.c | 2 +- + merge-index.c | 5 +- + merge-recursive.c | 1351 ++++++ + merge-tree.c | 10 +- + mktag.c | 2 +- + mktree.c | 5 +- + object-refs.c | 11 +- + object.c | 6 +- + object.h | 11 - + pack-check.c | 25 +- + pack-redundant.c | 18 +- + pager.c | 4 +- + patch-id.c | 2 +- + path-list.c | 5 +- + path.c | 10 +- + peek-remote.c | 5 +- + perl/.gitignore | 4 + + perl/Git.pm | 837 ++++ + perl/Makefile.PL | 28 + + perl/private-Error.pm | 827 ++++ + quote.c | 61 + + quote.h | 7 + + read-cache.c | 77 +- + receive-pack.c | 28 +- + refs.c | 26 +- + revision.c | 258 +- + revision.h | 14 +- + rsh.c | 31 +- + run-command.c | 8 +- + send-pack.c | 126 +- + server-info.c | 2 +- + setup.c | 2 + + sha1_file.c | 596 ++-- + sha1_name.c | 60 +- + sideband.c | 78 + + sideband.h | 13 + + ssh-fetch.c | 10 +- + ssh-upload.c | 4 +- + t/t1200-tutorial.sh | 2 +- + t/t1400-update-ref.sh | 86 +- + t/t3200-branch.sh | 12 + + t/t3403-rebase-skip.sh | 4 +- + t/t3700-add.sh | 22 + + t/t4015-diff-whitespace.sh | 122 + + t/t4103-apply-binary.sh | 4 +- + t/t4104-apply-boundary.sh | 115 + + t/t4116-apply-reverse.sh | 85 + + t/t4117-apply-reject.sh | 157 + + t/t5400-send-pack.sh | 14 + + t/t5510-fetch.sh | 69 + + t/t5600-clone-fail-cleanup.sh | 6 + + t/t5710-info-alternate.sh | 2 + + t/t6001-rev-list-graft.sh | 113 + + t/t7002-grep.sh | 31 +- + t/t7201-co.sh | 9 + + t/test-lib.sh | 17 +- + trace.c | 150 + + tree-diff.c | 15 +- + tree-walk.c | 4 +- + tree.c | 5 +- + builtin-read-tree.c => unpack-trees.c | 474 +-- + unpack-trees.h | 35 + + upload-pack.c | 190 +- + write_or_die.c | 45 + + wt-status.c | 276 ++ + wt-status.h | 25 + + xdiff-interface.c | 12 +- + xdiff/xutils.c | 29 +- + 237 files changed, 16898 insertions(+), 8168 deletions(-) + copy Documentation/{git-tar-tree.txt => git-archive.txt} (29%) + rewrite Documentation/git-rev-list.txt (61%) + rename Documentation/{git-upload-tar.txt => git-upload-archive.txt} (30%) + rewrite Documentation/gitk.txt (37%) + create mode 100644 Documentation/technical/racy-git.txt + copy builtin-tar-tree.c => archive-tar.c (59%) + create mode 100644 archive-zip.c + create mode 100644 archive.h + create mode 100644 builtin-archive.c + rename builtin-cat-file.c => builtin-cat-file.c (0%) + rename checkout-index.c => builtin-checkout-index.c (92%) + rename builtin-count.c => builtin-count-objects.c (99%) + rename name-rev.c => builtin-name-rev.c (97%) + rename pack-objects.c => builtin-pack-objects.c (81%) + create mode 100644 builtin-runstatus.c + rename symbolic-ref.c => builtin-symbolic-ref.c (75%) + rename unpack-objects.c => builtin-unpack-objects.c (82%) + create mode 100644 builtin-upload-archive.c + delete mode 100644 builtin-upload-tar.c + rename verify-pack.c => builtin-verify-pack.c (83%) + create mode 100644 check-racy.c + create mode 100644 color.c + create mode 100644 color.h + create mode 100644 compat/inet_pton.c + rewrite configure.ac (21%) + create mode 100755 contrib/completion/git-completion.bash + rename contrib/gitview/{gitview.txt => gitview.txt} (74%) + create mode 100644 contrib/vim/README + create mode 100644 contrib/vim/syntax/gitcommit.vim + rename git-merge-recursive.py => git-merge-recursive-old.py (100%) + create mode 100644 gitweb/git-favicon.png + create mode 100644 gitweb/git-logo.png + rename gitweb/{gitweb.cgi => gitweb.perl} (30%) + create mode 100644 grep.c + create mode 100644 grep.h + rename builtin-help.c => help.c (99%) + create mode 100644 interpolate.c + create mode 100644 interpolate.h + copy builtin-prune.c => list-objects.c (24%) + create mode 100644 list-objects.h + create mode 100644 merge-recursive.c + create mode 100644 perl/.gitignore + create mode 100644 perl/Git.pm + create mode 100644 perl/Makefile.PL + create mode 100644 perl/private-Error.pm + create mode 100644 sideband.c + create mode 100644 sideband.h + create mode 100755 t/t4015-diff-whitespace.sh + create mode 100755 t/t4104-apply-boundary.sh + create mode 100755 t/t4116-apply-reverse.sh + create mode 100755 t/t4117-apply-reject.sh + create mode 100755 t/t5510-fetch.sh + create mode 100755 t/t6001-rev-list-graft.sh + create mode 100644 trace.c + copy builtin-read-tree.c => unpack-trees.c (62%) + create mode 100644 unpack-trees.h + create mode 100644 write_or_die.c + create mode 100644 wt-status.c + create mode 100644 wt-status.h + +Alan Chandler (2): + Update the gitweb/README file to include setting the GITWEB_CONFIG +environment + Fix usage string to match that given in the man page + +Alex Riesen (3): + Use const for interpolate arguments + fix daemon.c compilation for NO_IPV6=1 + do not discard constness in interp_set_entry value argument + +Alexandre Julliard (2): + git.el: Fixed inverted "renamed from/to" message. + vc-git.el: Switch to using git-blame instead of git-annotate. + +Andy Whitcroft (4): + send-pack: remove remote reference limit + send-pack: switch to using git-rev-list --stdin + svnimport: add support for parsing From: lines for author + add proper dependancies on the xdiff source + +Aneesh Kumar K.V (4): + gitweb: Support for snapshot + gitweb: fix snapshot support + gitweb: Make blame and snapshot a feature. + gitweb: Fix git_blame + +Art Haas (1): + Patch for http-fetch.c and older curl releases + +Christian Couder (9): + Trace into open fd and refactor tracing code. + Trace into a file or an open fd and refactor tracing code. + Update GIT_TRACE documentation. + Fix memory leak in prepend_to_path (git.c). + Move add_to_string to "quote.c" and make it extern. + Fix a memory leak in "connect.c" and die if command too long. + Fix space in string " false" problem in "trace.c". + Remove empty ref directories that prevent creating a ref. + Fix tracing when GIT_TRACE is set to an empty string. + +David Rientjes (18): + blame.c return cleanup + builtin-grep.c cleanup + builtin-push.c cleanup + diff.c cleanup + http-push.c cleanup + read-cache.c cleanup + Make pprint_tag void and cleans up call in cmd_cat_file. + Make show_entry void + Make checkout_all void. + Make fsck_dir void. + Make pack_objects void. + Make track_tree_refs void. + Make upload_pack void and remove conditional return. + Make sha1flush void and remove conditional return. + make inline is_null_sha1 global + use appropriate typedefs + remove unnecessary initializations + Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. + +Dennis Stosberg (12): + "test" in Solaris' /bin/sh does not support -e + Makefile fix for Solaris + Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir + Solaris has strlcpy() at least since version 8 + Look for sockaddr_storage in sys/socket.h + Fix detection of ipv6 on Solaris + Fix compilation with Sun CC + gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'} + gitweb: Remove forgotten call to git_to_hash + use do() instead of require() to include configuration + lock_ref_sha1_basic does not remove empty directories on BSD + Add default values for --window and --depth to the docs + +Dmitry V. Levin (3): + Make count-objects, describe and merge-tree work in subdirectory + Documentation: Fix broken links + Handle invalid argc gently + +Eric Wong (13): + pass DESTDIR to the generated perl/Makefile + git-svn: establish new connections on commit after fork + git-svn: recommend rebase for syncing against an SVN repo + git-svn: add the 'dcommit' command + git-svn: stop repeatedly reusing the first commit message with dcommit + git-svn: multi-init saves and reuses --tags and --branches arguments + git-svn: log command fixes + Documentation/git-svn: document some of the newer features + git-svn: -h(elp) message formatting fixes + commit: fix a segfault when displaying a commit with unreachable parents + git-svn: add a message encouraging use of SVN::* libraries + git-svn: fix commits over svn+ssh:// + git-svn: reduce memory usage for large commits + +Franck Bui-Huu (11): + Add a newline before appending "Signed-off-by: " line + log-tree.c: cleanup a bit append_signoff() + Add git-archive + git-archive: wire up TAR format. + git-archive: wire up ZIP format. + Add git-upload-archive + connect.c: finish_connect(): allow null pid parameter + Test return value of finish_connect() + upload-archive: monitor child communication even more carefully. + git-archive: update documentation + Add git-upload-archive to the main git man page + +Haavard Skinnemoen (1): + git-send-email: Don't set author_not_sender from Cc: lines + +Jakub Narebski (139): + gitweb: whitespace cleanup + gitweb: Use list for of open for running git commands, thorougly. + gitweb: simplify git_get_hash_by_path + gitweb: More explicit error messages for open "-|" + gitweb: Cleanup - chomp $line in consistent style + gitweb: Cleanup - chomp @lines in consistent style + gitweb: Add git_page_nav for later use + gitweb: Navbar refactoring - use git_page_nav to generate navigation bar + gitweb: Replace form-feed character by ^L + gitweb: Show project descriptions with utf-8 characters in project list +correctly + gitweb: Add "\n" after
in git_page_nav + gitweb: Pager refactoring - use git_get_paging_nav for pagination + gitweb: Remove $project from git_get_paging_nav arguments + gitweb: Headers refactoring - use git_header_div for header divs + gitweb: Remove characters entities entirely when shortening string + gitweb: Ref refactoring - use git_get_referencing for marking +tagged/head commits + gitweb: Refactor generation of shortlog, tags and heads body + gitweb: do not quote path for list version of open "-|" + gitweb: Remove characters entities entirely when shortening string -- +correction + gitweb: Reordering code and dividing it into categories + gitweb: Refactoring git_project_list + autoconf: Add support for setting SHELL_PATH and PERL_PATH + autoconf: Move site configuration section earlier in configure.ac + autoconf: Add support for setting PYTHON_PATH or NO_PYTHON + autoconf: Check for ll hh j z t size specifiers introduced by C99 + autoconf: Typo cleanup, reordering etc. + Copy description of new build configuration variables to configure.ac + autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in +libc + gitweb: Separate input validation and dispatch, add comment about opml +action + gitweb: die_error first (optional) parameter is HTTP status + gitweb: Use undef for die_error to use default first (status) parameter +value + gitweb: Don't undefine query parameter related variables before +die_error + gitweb: Cleanup and uniquify error messages + gitweb: No periods for error messages + gitweb: No error messages with unescaped/unprotected user input + gitweb: PATH_INFO=/ means no project + gitweb: Inline $rss_link + gitweb: Refactor untabifying - converting tabs to spaces + gitweb: fix commitdiff for root commits + gitweb: Skip nonmatching lines in difftree output, consistently + autoconf: Unset NO_STH and NEED_STH when it is detected not needed + gitweb: Remove unused variables in git_shortlog_body and git_heads + autoconf: Add configure target to main Makefile + autoconf: Error out on --without-shell and --without-perl + autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling + autoconf: Move variables which we always set to config.mak.in + autoconf: It is --without-python, not --no-python + autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR + gitweb: Whitespace cleanup - tabs are for indent, spaces are for align + gitweb: Great subroutines renaming + gitweb: Separate ref parsing in git_get_refs_list into parse_ref + gitweb: Refactor printing shortened title in git_shortlog_body and +git_tags_body + gitweb: Separate main part of git_history into git_history_body + gitweb: Separate finding project owner into git_get_project_owner + gitweb: Change appereance of marker of refs pointing to given object + gitweb: Skip comments in mime.types like file + gitweb: True fix: Support for the standard mime.types map in gitweb + gitweb: Separate printing difftree in git_commit into git_difftree_body + gitweb: Show project's git URL on summary page + gitweb: Add support for per project git URLs + gitweb: Uniquify version info output, add meta generator in page header + gitweb: Refactor printing commit message + gitweb: Added parse_difftree_raw_line function for later use + gitweb: Use parse_difftree_raw_line in git_difftree_body + gitweb: bugfix: a.list formatting regression + gitweb: Replace some presentational HTML by CSS + gitweb: Whitespace cleanup: realign, reindent + gitweb: Use underscore instead of hyphen to separate words in HTTP +headers names + gitweb: Route rest of action subroutines through %actions + gitweb: Use here-doc + gitweb: Drop the href() params which keys are not in %mapping + gitweb: Sort CGI parameters returned by href() + gitweb: Use git-diff-tree patch output for commitdiff + gitweb: Show information about incomplete lines in commitdiff + gitweb: Remove invalid comment in format_diff_line + gitweb: Streamify patch output in git_commitdiff + gitweb: Add git_get_{following,preceding}_references functions + gitweb: Faster return from git_get_preceding_references if possible + gitweb: Add git_get_rev_name_tags function + gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header + gitweb: Add support for hash_parent_base parameter for blobdiffs + gitweb: Allow for pre-parsed difftree info in git_patchset_body + gitweb: Parse two-line from-file/to-file diff header in +git_patchset_body + gitweb: Add invisible hyperlink to from-file/to-file diff header + gitweb: Always display link to blobdiff_plain in git_blobdiff + gitweb: Change here-doc back for style consistency in git_blobdiff + gitweb: Use git-diff-tree or git-diff patch output for blobdiff + gitweb: git_blobdiff_plain is git_blobdiff('plain') + gitweb: Remove git_diff_print subroutine + gitweb: Remove creating directory for temporary files + gitweb: git_annotate didn't expect negative numeric timezone + gitweb: Remove workaround for git-diff bug fixed in f82cd3c + gitweb: Improve comments about gitweb features configuration + gitweb: blobs defined by non-textual hash ids can be cached + gitweb: Fix typo in git_difftree_body + gitweb: Fix typo in git_patchset_body + gitweb: Remove unused git_get_{preceding,following}_references + gitweb: Remove git_to_hash function + gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree +paramete + gitweb: Make git_print_log generic; git_print_simplified_log uses it + gitweb: Do not remove signoff lines in git_print_simplified_log + gitweb: Add author information to commitdiff view + gitweb: git_print_log: signoff line is non-empty line + gitweb: Add diff tree, with links to patches, to commitdiff view + gitweb: Add local time and timezone to git_print_authorship + gitweb: Move git-ls-tree output parsing to parse_ls_tree_line + gitweb: Separate printing of git_tree row into git_print_tree_entry + gitweb: Extend parse_difftree_raw_line to save commit info + gitweb: Change the name of diff to parent link in "commit" view to "diff + gitweb: Add GIT favicon, assuming image/png type + gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body + gitweb: Divide page path into directories -- path's "breadcrumbs" + autoconf: Add -liconv to LIBS when NEEDS_LIBICONV + autoconf: Check for subprocess.py + autoconf: Quote AC_CACHE_CHECK arguments + autoconf: Fix copy'n'paste error + autoconf: Set NO_ICONV if iconv is found neither in libc, nor in +libiconv + autoconf: Add support for setting NO_ICONV and ICONVDIR + autoconf: Add config.cache to .gitignore + gitweb: Make pickaxe search a feature + gitweb: Paginate history output + gitweb: Use File::Find::find in git_get_projects_list + gitweb: Do not parse refs by hand, use git-peek-remote instead + gitweb: Add git_project_index for generating index.aux + gitweb: Allow for href() to be used for links without project param + gitweb: Add link to "project_index" view to "project_list" page + gitweb: Fix mimetype_guess_file for files with multiple extensions + gitweb: Even more support for PATH_INFO based URLs + gitweb: Require project for almost all actions + gitweb: Always use git-peek-remote in git_get_references + gitweb: Make git_get_refs_list do work of git_get_references + gitweb: Fix thinko in git_tags and git_heads + gitweb: Make git_get_hash_by_path check type if provided + gitweb: Strip trailing slashes from $path in git_get_hash_by_path + gitweb: Use "return" instead of "return undef" for some subs + gitweb: Split validate_input into validate_pathname and validate_refname + gitweb: Add git_url subroutine, and use it to quote full URLs + gitweb: Quote filename in HTTP Content-Disposition: header + gitweb: Cleanup Git logo and Git logo target generation + +Jeff King (9): + gitweb: optionally read config from GITWEB_CONFIG + diff: support custom callbacks for output + Move color option parsing out of diff.c and into color.[ch] + git-commit.sh: convert run_status to a C builtin + git-status: document colorization config options + contrib/vim: add syntax highlighting file for commits + wt-status: remove extraneous newline from 'deleted:' output + rev-list: fix segfault with --{author,committer,grep} + git-repack: allow git-repack to run in subdirectory + +Johannes Schindelin (38): + Git.xs: older perl do not know const char * + Status update on merge-recursive in C + Cumulative update of merge-recursive in C + merge-recur: Convert variable names to lower_case + merge-recur: Get rid of debug code + merge-recur: Remove dead code + merge-recur: Fix compiler warning with -pedantic + merge-recur: Cleanup last mixedCase variables... + merge-recur: Explain why sha_eq() and struct stage_data cannot go + merge-recur: fix thinko in unique_path() + read-trees: refactor the unpack_trees() part + read-tree: move merge functions to the library + merge-recur: use the unpack_trees() interface instead of exec()ing +read-tree + merge-recur: virtual commits shall never be parsed + merge-recursive: fix rename handling + http-push: avoid fork() by calling merge_bases() directly + merge-recur: do not call git-write-tree + merge-recur: do not setenv("GIT_INDEX_FILE") + merge-recur: if there is no common ancestor, fake empty one + merge-recur: try to merge older merge bases first + merge-recur: do not die unnecessarily + discard_cache(): discard index, even if no file was mmap()ed + Add the --color-words option to the diff options family + builtin-mv: readability patch + unpack-objects: remove unused variable "eof" + Makefile: fix typo + Remove uneeded #include + fmt-merge-msg: fix off-by-one bug + Teach runstatus about --untracked + add receive.denyNonFastforwards config variable + receive-pack: plug memory leak in fast-forward checking code. + Document receive.denyNonFastforwards + runstatus: do not recurse into subdirectories if not needed + daemon: default to 256 for HOST_NAME_MAX if it is not defined + diff --stat: ensure at least one '-' for deletions, and one '+' for +additions + diff: fix 2 whitespace issues + cvsserver: Show correct letters for modified, removed and added files + cvsserver: fix "cvs diff" in a subdirectory + +Jon Loeliger (3): + Add virtualization support to git-daemon + Cleaned up git-daemon virtual hosting support. + Removed memory leaks from interpolation table uses. + +Jonas Fonseca (21): + git-apply(1): document missing options and improve existing ones + git-ls-remote(1): document --upload-pack + git-blame(1): mention options in the synopsis and advertise pickaxe + gitk(1): expand the manpage to look less like a template + git(7): put the synopsis in a verse style paragraph + gitview.txt: improve asciidoc markup + git-svn(1): improve asciidoc markup + describe: fix off-by-one error in --abbrev=40 handling + Use PATH_MAX instead of MAXPATHLEN + Use xrealloc instead of realloc + Use fstat instead of fseek + Use xcalloc instead of calloc + Add --relative-date option to the revision interface + git(7): move gitk(1) to the list of porcelain commands + Use xmalloc instead of malloc + Include config.mak.autogen in the doc Makefile + git-rev-list(1): group options; reformat; document more options + git-apply(1): document --unidiff-zero + git-repack(1): document --window and --depth + Fix trivial typos and inconsistencies in hooks documentation + gitk(1): mention --all + +Junio C Hamano (139): + Perl interface: add build-time configuration to allow building with +-fPIC + Perl interface: make testsuite work again. + perl: fix make clean + Git.pm: tentative fix to test the freshly built Git.pm + Perly Git: arrange include path settings properly. + Makefile: Set USE_PIC on x86-64 + Perly git: work around buggy make implementations. + Git.pm: clean generated files. + Perly Git: make sure we do test the freshly built one. + INSTALL: a tip for running after building but without installing. + Work around sed and make interactions on the backslash at the end of +line. + upload-pack: use object pointer not copy of sha1 to keep track of +has/needs. + upload-pack: lift MAX_NEEDS and MAX_HAS limitation + recur vs recursive: help testing without touching too many stuff. + sha1_file.c: expose map_sha1_file() interface. + pack-objects: reuse deflated data from new-style loose objects. + unpack-objects: read configuration data upon startup. + Makefile: git-merge-recur depends on xdiff libraries. + gitweb: There can be more than two levels of subdirectories + gitweb: an obvious cut and paste error. + gitweb: fix use of uninitialized value. + gitweb: when showing history of a tree, show tree link not blob + gitweb: avoid undefined value warning in print_page_path + gitweb/README: do not bug Kay with gitweb questions anymore + Makefile: gitweb/gitweb.cgi is now generated. + gitweb: do not use @@FOO@@ for replaced tokens + .gitignore: git-merge-recur is a built file. + Make git-checkout-index a builtin + builtins: Makefile clean-up + git.c: Rename NEEDS_PREFIX to RUN_SETUP + autoconf: fix NEEDS_SSL_WITH_CRYPTO + autoconf: NO_IPV6 + Racy git: avoid having to be always too careful + read-cache: tweak racy-git delay logic + autoconf: clean temporary file mak.append + git-grep: show pathnames relative to the current directory + upload-pack: minor clean-up in multi-ack logic + Fix type of combine-diff.c::show_patch_diff() + Remove combine-diff.c::uninteresting() + t4116 apply --reverse test + git-apply --reverse: simplify reverse option. + git-apply --binary: clean up and prepare for --reverse + avoid nanosleep(2) + Documentation/technical/racy-git.txt + Add check program "git-check-racy" + Remove the "delay writing to avoid runtime penalty of racy-git +avoidance" + builtin-grep: remove unused debugging cruft. + builtin-apply --reverse: two bugfixes. + diff.c: make binary patch reversible. + apply --reverse: tie it all together. + git-apply --reject + git-apply --reject: send rejects to .rej files. + git-apply --verbose + apply --reject: count hunks starting from 1, not 0 + Convert memset(hash,0,20) to hashclr(hash). + hashcpy/hashcmp remaining bits. + builtin-grep.c: remove unused debugging piece. + update-index -g + git-apply --reject: finishing touches. + free(NULL) is perfectly valid. + daemon: prepare for multiple services. + daemon: add upload-tar service. + multi-service daemon: documentation + t5710: fix two thinkos. + Constness tightening for move/link_temp_to_file() + consolidate two copies of new style object header parsing code. + pack-objects: re-validate data we copy from elsewhere. + Revert "Convert git-annotate to use Git.pm" + Revert "Git.pm: Introduce fast get_object() method" + Revert "Make it possible to set up libgit directly (instead of from the +environment)" + pack-objects: fix thinko in revalidate code + more lightweight revalidation while reusing deflated stream in packing + unpack-objects desperately salvages objects from a corrupt pack + revision.c: allow injecting revision parameters after setup_revisions(). + Teach rev-list an option to read revs from the standard input. + Revert "daemon: add upload-tar service." + Make apply --binary a no-op. + diff --binary generates full index on binary files. + Separate object listing routines out of rev-list + pack-objects: run rev-list equivalent internally. + pack-objects: further work on internal rev-list logic. + pack-objects --unpacked= option. + get_sha1_hex() micro-optimization + archive: allow remote to have more formats than we understand. + Move sideband client side support into reusable form. + Move sideband server side support into reusable form. + archive: force line buffered output to stderr + Add --verbose to git-archive + Teach --exec to git-archive --remote + Prepare larger packet buffer for upload-pack protocol. + Add sideband status report to git-archive protocol + upload-archive: monitor child communication more carefully. + builtin-archive.c: rename remote_request() to extract_remote_arg() + pack-objects: document --revs, --unpacked and --all. + http-fetch: fix alternates handling. + unpack-objects -r: call it "recover". + Document git-grep -[Hh] + Define fallback PATH_MAX on systems that do not define one in + Fix git-am safety checks + http-fetch.c: consolidate code to detect missing fetch target + Add ftp:// protocol support for git-http-fetch + t1400: make test debuggable. + apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches + builtin-grep: make pieces of it available as library. + revision traversal: prepare for commit log match. + revision traversal: --author, --committer, and --grep. + repack: use only pack-objects, not rev-list. + Update grep internal for grepping only in head/body + git log: Unify header_filter and message_filter into one. + Make hexval() available to others. + sha1_name.c: understand "describe" output as a valid object name + diff.c: second war on whitespace. + git-apply: second war on whitespace. + Add t5510 to test per branch configuration affecting git-fetch. + Remove upload-tar and make git-tar-tree a thin wrapper to git-archive + Deprecate merge-recursive.py + diff --stat: allow custom diffstat output width. + diff --stat: color output. + An illustration of rev-list --parents --pretty=raw + grep: free expressions and patterns when done. + grep: fix --fixed-strings combined with expression. + Contributed bash completion support for core Git tools. + git-diff -B output fix. + Remove -fPIC which was only needed for Git.xs + GIT 1.4.3-rc1 + Makefile: install and clean merge-recur, still. + escape tilde in Documentation/git-rev-parse.txt + tar-tree deprecation: we eat our own dog food. + gitweb: Make the Git logo link target to point to the homepage + git-send-email: avoid uninitialized variable warning. + cherry-pick: make -r the default + Add WEBDAV timeout to http-fetch. + Fix git-revert + git-fetch --update-head-ok typofix + git-pull: we say commit X, not X commit. + git.spec.in: perl subpackage is installed in perl_vendorlib not +vendorarch + apply --numstat -z: line termination fix. + t4015: work-around here document problem on Cygwin. + Revert "move pack creation to version 3" + +Linus Torvalds (10): + Relative timestamps in git log + git-fsck-objects: lacking default references should not be fatal + Fix git-fsck-objects SIGSEGV/divide-by-zero + Add "-h/-H" parsing to "git grep" + Allow multiple "git_path()" uses + git-log --author and --committer are not left-anchored by default + Clean up approxidate() in preparation for fixes + Fix approxidate() to understand more extended numbers + diff --stat=width[,name-width]: allow custom diffstat output width. + Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34 + +Liu Yubao (1): + Fix duplicate xmalloc in builtin-add + +Luben Tuikov (22): + gitweb: git_tree displays blame based on repository config + gitweb: bugfix: git_commit and git_commitdiff parents + gitweb: blame table row no highlight fix + gitweb: bugfix: commitdiff regression + gitweb: bugfix: git_print_page_path() needs the hash base + gitweb: tree view: eliminate redundant "blob" + gitweb: Remove redundant "tree" link + gitweb: extend blame to show links to diff and previous + Revert "gitweb: extend blame to show links to diff and previous" + gitweb: Remove excessively redundant entries from git_difftree_body + gitweb: Add history and blame to git_difftree_body() + gitweb: "alternate" starts with shade (i.e. 1) + gitweb: Remove redundant "commit" link from shortlog + gitweb: Factor out gitweb_have_snapshot() + gitweb: Add snapshot to shortlog + gitweb: Don't use quotemeta on internally generated strings + gitweb: Remove redundant "commit" from history + gitweb: History: blob and tree are first, then commitdiff, etc + gitweb: tree view: hash_base and hash are now context sensitive + gitweb: Escape ESCAPE (\e) character + gitweb: Do not print "log" and "shortlog" redundantly in commit view + gitweb: blame: Minimize vertical table row padding + +Markus Amsler (1): + git-imap-send: Strip smtp From_ header from imap message. + +Martin Langhoff (1): + git-repack: create new packs inside $GIT_DIR, not cwd + +Martin Waitz (16): + gitweb: fill in gitweb configuration by Makefile + gitweb: use out-of-line GIT logo. + gitweb: provide function to format the URL for an action link. + gitweb: consolidate action URL generation. + gitweb: continue consolidation of URL generation. + gitweb: support for "fp" parameter. + gitweb: support for / as home_link. + gitweb: fix project list if PATH_INFO=="/". + gitweb: more support for PATH_INFO based URLs + gitweb: fix uninitialized variable warning. + gitweb: fix display of trees via PATH_INFO. + gitweb: document webserver configuration for common gitweb/repo URLs. + git-commit: cleanup unused function. + git-commit: fix coding style. + test-lib: separate individual test better in verbose mode. + paginate git-diff by default + +Matthias Kestenholz (6): + Make git-name-rev a builtin + Make git-pack-objects a builtin + Make git-unpack-objects a builtin + Make git-symbolic-ref a builtin + Add gitweb.cgi to .gitignore + Check if pack directory exists prior to descending into it + +Matthias Lederhofer (12): + pager: environment variable GIT_PAGER to override PAGER + gitweb: use a hash to lookup the sub for an action + gitweb: require $ENV{'GITWEB_CONFIG'} + gitweb: check if HTTP_ACCEPT is really set + gitweb: fix commitdiff_plain for root commits + gitweb: fix $project usage + gitweb: do not use 'No such directory' error message + gitweb: export options + gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export + gitweb fix validating pg (page) parameter + format-patch: use cwd as default output directory + git-format-patch: fix bug using -o in subdirectories + +Nicolas Pitre (4): + move pack creation to version 3 + many cleanups to sha1_file.c + add commit count options to git-shortlog + atomic write for sideband remote messages + +Paul Mackerras (10): + gitk: Minor cleanups + gitk: Recompute ancestor/descendent heads/tags when rereading refs + gitk: Add a row context-menu item for creating a new branch + gitk: Add a context menu for heads + gitk: Fix a couple of buglets in the branch head menu items + gitk: Add a menu item for cherry-picking commits + gitk: Update preceding/following tag info when creating a tag + gitk: Improve responsiveness while reading and layout out the graph + gitk: Fix some bugs in the new cherry-picking code + diff-index --cc shows a 3-way diff between HEAD, index and working tree. + +Pavel Roskin (3): + Fix probing for already installed Error.pm + Delete manuals if compiling without docs + Make perl interface a separate package + +Petr Baudis (48): + Introduce Git.pm (v4) + Git.pm: Implement Git::exec_path() + Git.pm: Call external commands using execv_git_cmd() + Git.pm: Implement Git::version() + Add Error.pm to the distribution + Git.pm: Better error handling + Git.pm: Handle failed commands' output + Git.pm: Enhance the command_pipe() mechanism + Git.pm: Implement options for the command interface + Git.pm: Add support for subdirectories inside of working copies + Convert git-mv to use Git.pm + Git.pm: assorted build related fixes. + Git.pm: Try to support ActiveState output pipe + Git.pm: Swap hash_object() parameters + Git.pm: Fix Git->repository("/somewhere/totally/elsewhere") + Git.pm: Support for perl/ being built by a different compiler + Git.pm: Remove PerlIO usage from Git.xs + Git.pm: Avoid ppport.h + Git.pm: Don't #define around die + Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC +munging + Git.pm: Add config() method + Convert git-send-email to use Git.pm + Git.pm: Introduce ident() and ident_person() methods + Make it possible to set up libgit directly (instead of from the +environment) + Git.pm: Introduce fast get_object() method + Convert git-annotate to use Git.pm + Eliminate Scalar::Util usage from private-Error.pm + Fix showing of path in tree view + gitweb: Link (HEAD) tree for each project from projects list + gitweb: More per-view navigation bar links + gitweb: Link to tree instead of snapshot in shortlog + gitweb: Link to latest tree from the head line in heads list + gitweb: Link to associated tree from a particular log item in full log +view + gitweb: Rename "plain" labels to "raw" + gitweb: Relabel "head" as "HEAD" + Make path in tree view look nicer + gitweb: Fix tree link associated with each commit log entry. + gitweb: Fix @git_base_url_list usage + Fix snapshot link in tree view + Git.pm: Kill Git.xs for now + Deprecate git-resolve.sh + gitweb: Consolidate escaping/validation of query string + gitweb: fix over-eager application of esc_html(). + Show snapshot link in shortlog only if have_snapsho + gitweb: Separate (new) and (deleted) in commitdiff by a space + gitweb: Handle commits with empty commit messages more reasonably + gitweb: [commit view] Do not suppress commitdiff link in root commit + svnimport: Fix broken tags being generated + +Pierre Habouzit (7): + Fix a comparison bug in diff-delta.c + avoid to use error that shadows the function name, use err instead. + git_dir holds pointers to local strings, hence MUST be const. + missing 'static' keywords + remove ugly shadowing of loop indexes in subloops. + use name[len] in switch directly, instead of creating a shadowed +variable. + n is in fact unused, and is later shadowed. + +Randal L. Schwartz (1): + builtin-upload-archive.c broken on openbsd + +Rene Scharfe (21): + git-verify-pack: make builtin + Axe the last ent + Add write_or_die(), a helper function + Add git-zip-tree + git-cherry: remove unused variable + git-reset: remove unused variable + Add git-zip-tree to .gitignore + git-archive: make compression level of ZIP archives configurable + Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c + git-archive: inline default_parse_extra() + git-tar-tree: devolve git-tar-tree into a wrapper for git-archive + Remove git-zip-tree + Rename builtin-zip-tree.c to archive-zip.c + git-tar-tree: Remove duplicate git_config() call + git-tar-tree: Move code for git-archive --format=tar to archive-tar.c + git-tar-tree: don't RUN_SETUP + Documentation: add missing second colons and remove a typo + Add hash_sha1_file() + Make write_sha1_file_prepare() static + Make write_sha1_file_prepare() void + Replace open-coded version of hash_sha1_file() + +Robin Rosenberg (3): + Quote arguments to tr in test-lib + Make cvsexportcommit remove files. + Error in test description of t1200-tutorial + +Santi Béjar (4): + Fetch: default remote repository from branch properties + fetch: get the remote branches to merge from the branch properties + Add test for the default merges in fetch. + fetch: Reset remote refs list each time fetch_main is called + +Sasha Khapyorsky (3): + Trivial support for cloning and fetching via ftp://. + git-svnimport: Parse log message for Signed-off-by: lines + http/ftp: optionally ask curl to not use EPSV command + +Sergey Vlasov (2): + Documentation: Fix howto/revert-branch-rebase.html generation + git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1 + +Shawn Pearce (15): + Verify we know how to read a pack before trying to using it. + Remove unnecessary forward declaration of unpack_entry. + Convert memcpy(a,b,20) to hashcpy(a,b). + Convert memcpy(a,b,20) to hashcpy(a,b). + Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry. + Reuse compression code in unpack_compressed_entry. + Cleanup unpack_entry_gently and friends to use type_name array. + Cleanup unpack_object_header to use only offsets. + Convert unpack_entry_gently and friends to use offsets. + Replace uses of strdup with xstrdup. + Allow 'svn fetch' on '(no date)' revisions in Subversion. + Allow '(no author)' in git-svn's authors file. + Ignore executable bit when adding files if filemode=0. + Allow git-checkout when on a non-existant branch. + Corrected copy-and-paste thinko in ignore executable bit test case. + +Tilman Sauerbeck (2): + Indentation fix. + Added support for dropping privileges to git-daemon. + +Timo Hirvonen (2): + --name-only, --name-status, --check and -s are mutually exclusive + Remove awkward compatibility warts + +Ville Skyttä (1): + Be nicer if git executable is not installed + +Yasushi SHOJI (4): + gitweb: configurable home link string + gitweb: Decode long title for link tooltips + gitweb: refactor decode() for utf8 conversion + clone: the given repository dir should be relative to $PWD + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.2.4 +From: Junio C Hamano +Date: 2006-10-17 5:31:56 + +The latest maintenance release GIT 1.4.2.4 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.2.4.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.2.4.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.2.4.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.2.4-1.$arch.rpm (RPM) + +We are close to 1.4.3, so this update coulc become moot very +soon, but just in case we have to delay it, I am pushing this +out for a rather important performance fix. Without it, "git +diff" on 64-bit machines can run 100x times slower than it +should be on unfortunate input. + +Many thanks go to Jim Mayering for giving an easy to reproduce +initial problem report, and Linus and Davide Libenzi to quickly +come up with a fix. + +Unfortunately I do not have access to any RPM capable machine +other than an x86-64 right now hence there is no RPM for x86-32 +for this release yet (but 32-bit machines do not need this fix +to begin with, so it's Ok). + +---------------------------------------------------------------- + +There is only one change since v1.4.2.3. + +Linus Torvalds: + Fix hash function in xdiff library + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.2.3 +From: Junio C Hamano +Date: 2006-10-02 8:17:19 + +The latest maintenance release GIT 1.4.2.3 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.2.3.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.2.3.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.2.3.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.2.3-1.$arch.rpm (RPM) + +Sorry to be doing two maintenance releases in rapid succession, +but git-mv breakage causes random tree corruption and is rather +serious. + +---------------------------------------------------------------- + +Changes since v1.4.2.2 are as follows: + +Junio C Hamano: + git-mv: invalidate the removed path properly in cache-tree + git-push: .git/remotes/ file does not require SP after colon + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.2.2 +From: Junio C Hamano +Date: 2006-09-30 6:53:41 + +The latest maintenance release GIT 1.4.2.2 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.2.2.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.2.2.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.2.2.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.2.2-1.$arch.rpm (RPM) + +This is strictly a bugfix release. While we will soon be in +stabilization slow-down for 1.4.3, one of the bugs this release +contains fixes for actually has bitten people who use the kernel +commits mailing list, so this is to push the fixes out early. + +---------------------------------------------------------------- + +Changes since v1.4.2.1 are as follows: + +Junio C Hamano: + Fix git-am safety checks + git-diff -B output fix. + +Liu Yubao: + Fix duplicate xmalloc in builtin-add + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.2.1 +From: Junio C Hamano +Date: 2006-09-13 19:19:21 + +The latest maintenance release GIT 1.4.2.1 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.2.1.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.2.1.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.2.1.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.2.1-1.$arch.rpm (RPM) + +This release is primarily for these two fixes: + + * git-mv was broken. Notably, this did not work: + + git-mv foo foo-renamed + + * git-http-fetch failed to follow objects/info/alternates on + the remote side. This broke a fetch from Paul's powerpc.git + repository. + +I have built i386 and x86_64 RPM this time, since the machine I +do the former has become available again. + +---------------------------------------------------------------- + +Changes since v1.4.2 are as follows: + +Dennis Stosberg: + Solaris does not support C99 format strings before version 10 + +Johannes Schindelin: + git-mv: succeed even if source is a prefix of destination + git-mv: add more path normalization + git-mv: special case destination "." + git-mv: fix off-by-one error + builtin-mv: readability patch + +Junio C Hamano: + finish_connect(): thinkofix + http-fetch: fix alternates handling. + +Luben Tuikov: + Fix regex pattern in commit-msg + sample commit-msg hook: no silent exit on duplicate Signed-off-by lines + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.2 +From: Junio C Hamano +Date: 2006-08-13 3:17:40 + +The latest feature release GIT 1.4.2 is available at the usual +places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.2.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.2.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.2.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.2-1.$arch.rpm (RPM) + +I do not currently have access to i386 RH boxes, so there is +only x86_64 RPM in the RPMS directory mentioned above. + +---------------------------------------------------------------- + +Changes since v1.4.1.1 are as follows: + +A Large Angry SCM: + Additional merge-base tests (revised) + +Alex Riesen: + Do not use perl in git-commit.sh + Trivial path optimization test + +Alexandre Julliard: + git.el: Run git-rerere on commits if the rr-cache directory exists. + git.el: Prepend a slash to the file name when adding to .gitignore. + git.el: Try to reuse an existing buffer when running git-status. + git.el: Put the git customize group in the 'tools' parent group. + show-branch: Fix another performance problem. + +Alp Toker: + Fix some doubled word typos + Fix some doubled word typos + Fix typos involving the word 'commit' + typofix (git-name-rev documentation) + git-send-email: Remove redundant Reply-To header + gitweb: Send XHTML as 'application/xhtml+xml' where possible + gitweb: Include a site name in page titles + gitweb: Make command invocations go through the git wrapper + documentation (urls.txt) typofix + +Daniel Drake: + gitweb: escape tag comments + +Dennis Stosberg: + gitweb: Declare global variables with "our" + gitweb: Declare global variables with "our" + +Eric Wong: + Add git-instaweb, instantly browse the working repo with gitweb + instaweb: fix unportable ';' usage in sed + t8001-annotate: fix a bash-ism in this test + git-svn: avoid fetching files outside of the URL we're tracking + git-svn: migrate out of contrib + builtin-log: respect diff configuration options + diff.c: respect diff.renames config option + templates/hooks--update: replace diffstat calls with git diff --stat + git-svn: fix --file/-F option in commit-diff + tests: Set EDITOR=: and VISUAL=: globally + git-fetch: fix a bashism (==) + git-svn: don't check for migrations/upgrades on commit-diff + typechange tests for git apply (currently failing) + git-svn: fix fetching new directories copies when using SVN:: libs + git-svn: correctly kill keyword expansion without munging EOLs + git-svn: bugfix: allow SVN:: lib users to track the root of the +repository + git-svn: split the path from the url correctly with limited perms + +Gerrit Pape: + Build on Debian GNU/kFreeBSD + +Jakub Narebski: + Allow INSTALL, bindir, mandir to be set in main Makefile + Rename man1 and man7 variables to man1dir and man7dir + autoconf: Use autoconf to write installation directories to +config.mak.autogen + send-email: format 2822 datestring ourselves. + Teach make clean about configure and autoconf + Copy description of build configuration variables to configure.ac + autoconf: Preparing the way for autodetection + autoconf: Checks for typedefs, structures, and compiler characteristics. + autoconf: Checks for some library functions. + autoconf: Checks for libraries + autoconf: Checks for some programs + configure.ac vertical whitespace usage cleanup + Wrap long lines in docstrings in contrib/emacs/git.el + Display help for Git mode after pressing `h' or `?' in *git-status* + +Jeff King: + pack-objects: check pack.window for default window size + Colorize 'commit' lines in log ui + git-push: allow -f as an alias for --force + git-push: remove obsolete git-push.sh + Documentation: convert uses of git-link macro to gitlink + git-annotate: remove extraneous debugging line + git-push: allow pushing from subdirectories + +Joachim B Haga: + Make zlib compression level configurable, and change default. + +Joachim Berdal Haga: + core.compression documentation formatting fix. + +Johannes Schindelin: + refactor merge_bases() as preparation to libify merge-base + move get_merge_bases() to core lib. + Makefile: replace ugly and unportable sed invocation + Make git-fmt-merge-msg a builtin + Makefile: export NO_SVN_TESTS + Close the index file between writing and committing + Fix linking for not-so-clever linkers. + Fix t4114 on cygwin + Always reset the color _before_ printing out the newline + cvsserver: suppress warnings + cvsserver: avoid warning about active db handles + Allow an alias to start with "-p" + git wrapper: add --git-dir= and --bare options + git-instaweb: some Apache have mod_cgi builtin + git-instaweb: respect bindir from Makefile + gitweb: fix two warnings + t7001: add test for git-mv dir1 dir2/ + git-cvsserver: support multiline commit messages + Extract helper bits from c-merge-recursive work + Make git-mv a builtin + builtin git-mv: support moving directories + instaweb: Be more clear if httpd or the browser fail + cvsserver: imitate git-update-ref when committing + Makefile: ssh-pull.o depends on ssh-fetch.c + Teach git-apply about '-R' + Fix http-fetch + tar-tree: illustrate an obscure feature better + Fix crash when GIT_DIR is invalid + +Jonas Fonseca: + Documentation/urls.txt: Use substitution to escape square brackets + Update git-init-db(1) and documentation of core.sharedRepository + +Josef Weidendorfer: + Extend testing git-mv for renaming of subdirectories + +Josh Triplett: + git-format-patch: Make the second and subsequent mails replies to the +first + Add option to enable threading headers + Add option to set initial In-Reply-To/References + +Junio C Hamano: + Makefile: add framework to verify and bench sha1 implementations. + test-sha1: test hashing large buffer + t4013: add tests for diff/log family output options. + t4013: add more tests around -c and --cc + Fix some more diff options changes. + t4013 test updates for new output code. + combine-diff.c: type sanity. + format-patch: fix diff format option implementation + t4013: add format-patch tests. + t4013: note improvements brought by the new output code. + gitweb: optimize per-file history generation + gitweb: optimize per-file history generation + t4013: add "diff" UI program tests. + builtin-diff: turn recursive on when defaulting to --patch format. + commit.c: do not redefine UNINTERESTING bit. + get_merge_bases: clean up even when there is no common commit. + revert clear-commit-marks for now. + boolean: accept yes and no as well + send-email: do not barf when Term::ReadLine does not like your terminal + t6200: fmt-merge-msg test. + git-grep: fix parsing of pathspec separator '--' + git-grep: fix exit code when we use external grep. + git-grep: use a bit more specific error messages. + Re-fix clear_commit_marks(). + git-grep: boolean expression on pattern matching. + git-reset: complain and exit upon seeing an unknown parameter. + mailinfo: assume input is latin-1 on the header as we do for the body + diffcore-rename: try matching up renames without populating filespec +first. + builtin-rev-parse.c: constness tightening + show-branch: match documentation and usage + rev-parse documentation: talk about range notation. + git-svn: migrate out of contrib (follow-up) + diff.c: --no-color to defeat diff.color configuration. + Update diff-options and config documentation. + git log -p --merge [[--] paths...] + colored diff: diff.color = auto fix + diff: do not use configuration magic at the core-level + "git -p cmd" to page anywhere + merge-base: update the clean-up postprocessing + fmt-merge-msg fix + Fix grammatical error in git-revert + git-repack: avoid redirecting stderr into git-pack-objects + test-lib: unset GIT_TRACE + t4013 diff format tests update + Adjust t4013 tests to corrected format-patch. + Documentation: Fix ssh://[user@]host.xz URL + fetch/clone: check return status from ls-remote + builtin-prune.c: forgot TYPE => OBJ changes. + Documentation/Makefile: product depends on asciidoc.conf + builtin-log: typefix for recent format-patch changes. + show-branch: fix performance problem. + checkout -f failed to check out a file if an existing directory +interfered. + apply: check D/F conflicts more carefully. + apply: split out removal and creation into different phases. + apply: handle type-changing patch correctly. + git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B" + git-fetch: fix --keep vs --thin + unpack-objects: remove stale and confusing comment + t4112: simplify the test and remove unneeded working tree file. + lost-found: use fsck-objects --full + git-reset: detect update-ref error and report it. + log and diff family: honor config even from subdirectories + git-apply -R: binary patches are irreversible for now. + t4103: fix binary patch application test. + git-checkout: allow "checkout HEAD -- path" + Builtins: control the use of pager from the command table. + fetch/clone: mark messages from remote side stand out. + Cygwin needs NO_C99_FORMAT??? + Fix "git diff blob1 blob2" showing the diff in reverse. + read-tree: shadowed variable fix. + Add a couple of subdirectory tests. + diff.c: do not use pathname comparison to tell renames + Show both blob names from "git diff blob1 blob2" + sideband: do not use color, just say "remote:" + Documentation/git.txt: link git-svn and git-instaweb from the main page. + GIT 1.4.2-rc3 + Further clean-up: usage() vs die() + Makefile: Cygwin does not seem to need NO_STRLCPY + Fix "grep -w" + debugging: XMALLOC_POISON + builtin-mv: fix use of uninitialized memory. + GIT-VERSION-GEN: adjust for ancient git + Documentation: git-status takes the same options as git-commit + Fix tutorial-2.html + check return value from diff_setup_done() + find_unique_abbrev() with len=0 should not abbreviate + make --find-copies-harder imply -C + allow diff.renamelimit to be set regardless of -M/-C + git-apply: applying a patch to make a symlink shorter. + combine-diff: use color + Fix git-diff A...B + builtin-apply: remove unused increment + git-sh-setup: do not use repo-config to test the git directory + git-am: give better diagnostics when the patch does not apply during +--3way + Better error message when we are unable to lock the index file + t/t4013: fix futzing with the version string. + +Linus Torvalds: + xdiff: generate "anti-diffs" aka what is common to two files + Prepare "git-merge-tree" for future work + Improved three-way blob merging code + Improve git-peek-remote + builtin "git prune" + Make the unpacked object header functions static to sha1_file.c + Remove TYPE_* constant macros and use object_type enums consistently. + sha1_file: add the ability to parse objects in "pack file format" + Call setup_git_directory() early + Call setup_git_directory() much earlier + Fix double "close()" in ce_compare_data + Fix up some fallout from "setup_git_directory()" cleanups + +Luben Tuikov: + gitweb: Enable tree (directory) history display + gitweb: Enable tree (directory) history display + Add "raw" output option to blobs in "tree" view format + gitweb.cgi: Create $git_temp if it doesn't exist + gitweb.cgi: Teach "a=blob" action to know the blob/file mime type + gitweb.css: Use monospace fonts for commits and tree-diff. + gitweb.cgi: Teach git_history() to read hash from $hash_base + gitweb.cgi: Include direct link to "raw" files from "history" + gitweb.cgi: git_blame2: an alternative simple working git blame + gitweb.cgi: git_blame2: Allow back-trekking through commits + gitweb.cgi: Show "raw" head of project link even when $hash is not +defined + gitweb.cgi: git_blame2: Revision blocks now have alternating colors + gitweb.cgi: Centralize printing of the page path + gitweb.cgi: git_blame2: slight optimization reading the blame lines + +Lukas Sandström: + git-am: Don't accept an mbox on stdin of we already have a .dotest +directory + +Martin Langhoff: + cvsexportcommit - add -a (add author line) flag, cleanup warnings + +Matthias Kestenholz: + Make git-prune-packed a builtin + Make git-repo-config a builtin + use declarations from builtin.h for builtin commands + +Matthias Lederhofer: + GIT_TRACE: show which built-in/external commands are executed + change ent to tree in git-diff documentation + git-rev-list: add documentation for --parents, --no-merges + daemon: use a custom die routine with syslog + daemon: if one of the standard fds is missing open it to /dev/null + upload-pack: ignore write errors to stderr + daemon: new option --pid-file= to store the pid + daemon: new option --detach to run git-daemon in background + Documentation about exclude/ignore files + argv created by handle_alias should be NULL terminated + upload-pack: fix timeout in create_pack_file + daemon: documentation for --reuseaddr, --detach and --pid-file + setup_git_directory_gently: do not barf when GIT_DIR is given. + git.c: allow alias expansion without a git directory + pager: config variable pager.color + git-grep: document --and, --or, --not, ( and ) + +Michael: + fixed variable declaration in gitk + +Michael Krelin: + handle https:// protocol in git-clone + +Michael S. Tsirkin: + mailinfo: accept >From in message header + +Michal Rokos: + sed -e '/RE/r rfile/' needs space in 'r rfile' + Using 'perl' in *.sh + +Paul Mackerras: + gitk: Allow the user to set some colors + gitk: Show the currently checked-out head in bold font + +Pavel Roskin: + Assorted typo fixes + Typofix in Makefile comment. + Typofix in configure.ac comment. + Fix more typos, primarily in the code + Avoid C99 comments, use old-style C comments instead. + Quote all calls to GIT_CONF_APPEND_LINE + Set datarootdir in config.mak.in + +Peter Baumann: + git-cvsexportcommit can't handle merge commits correctly + +Peter Eriksen: + Substitute xmalloc()+memset(0) with xcalloc(). + +Petr Baudis: + Remove -d from *-fetch usage strings + Make pull() take some implicit data as explicit arguments + Make pull() support fetching multiple targets at once + Teach git-local-fetch the --stdin switch + Teach git-http-fetch the --stdin switch + +Ramsay Jones: + Ensure git-clone exits with error if perl script fails. + Fix annotate test script; notice when git-annotate fails. + Fix installation of templates on ancient systems. + New tests and en-passant modifications to mktag. + Add NO_C99_FORMAT to support older compilers. + Fix header breakage due to redefining PATH_MAX. + Remove cmd_usage() routine and re-organize the help/usage code. + Fix header breakage with _XOPEN_SOURCE. + Fixup command names in some usage strings. + Replace some calls to die(usage_str) with usage(usage_str). + Allow config file to specify Signed-off-by identity in format-patch. + commit walkers: setup_ident() to record correct committer in ref-log. + +Rene Scharfe: + Add get_merge_bases_clean() + Add '...' operator for revisions + Make clear_commit_marks() clean harder + Fold get_merge_bases_clean() into get_merge_bases() + rev-list: free commit_list in ... handler + git-tar-tree: fix minor memory leak + Add has_extension() + git-verify-pack: show usage when no pack was specified + git-verify-pack: more careful path handling + git-verify-pack: insist on .idx extension + git-verify-pack: get rid of while loop + git-verify-pack: free pack after use and a cleanup + git-verify-pack: buffer overrun paranoia + git-verify-pack: no need to count errors + drop length argument of has_extension + +Robert Shearman: + format-patch: Generate a newline between the subject header and the +message \ + body + rebase: Fix the detection of fast-forwarding of the current branch to +upstream. + rebase: Make the fast-fowarding message more user-friendly by using +branch \ +names instead of SHA1 IDs. + +Rutger Nijlunsing: + http-push: Make WebDAV work with (broken?) default apache2 WebDAV module + Add Documentation/howto/setup-git-server-over-http.txt + +Ryan Anderson: + annotate: Support annotation of files on other revisions. + annotate: Correct most merge following to annotate correctly. + Disable color detection during format-patch + log-tree: show_log() should respect the setting of +diffopt->line_termination + annotate: Fix bug when parsing merges with differing real and logical +parents. + +Santi Béjar: + Teach rev-parse the ... syntax. + Defaulting fetch to origin when set in the repo-config + +Sergey Vlasov: + Fix "git-fetch --tags" exit status when nothing has been changed + +Shawn Pearce: + Avoid C99 initializers + Allow user.name and user.email to drive reflog entry. + Record the type of commit operation in the reflog. + Log ref changes made by git-fetch and git-pull. + Log ref changes made by git-merge and git-pull. + Log ref changes made by quiltimport. + Log ref changes made by resolve. + Make lazy mkdir more robust. + Record rebase changes as 'rebase' in the reflog. + Disable linking with Fink or DarwinPorts. + Display an error from update-ref if target ref name is invalid. + +Stephan Feder: + Do not drop data from '\0' until eol in patch output + Teach --text option to diff + Teach diff -a as shorthand for --text + Add -a and --text to common diff options help + diff-options: Explain --text and -a + +Timo Hirvonen: + Merge with_raw, with_stat and summary variables to output_format + Make --raw option available for all diff commands + Set default diff output format after parsing command line + DIFF_FORMAT_RAW is not default anymore + Add msg_sep to diff_options + Don't xcalloc() struct diffstat_t + whatchanged: Default to DIFF_FORMAT_RAW + Print empty line between raw, stat, summary and patch + diff-tree: Use ---\n as a message separator + log --raw: Don't descend into subdirectories by default + Fix diff-tree -s + GIT_TRACE: fix a mixed declarations and code warning + diff: Support both attributes and colors + diff: Support 256 colors + +Unknown: + A better-scheduled PPC SHA-1 implementation. + +Uwe Zeisberger: + Document rev-list's option --merge + +Ville Skyttä: + Fix print-log and diff compatibility with recent vc versions + +Willy Tarreau: + tar-tree: add the "tar.umask" config option + +Yakov Lerner: + Mention the [user@] part in documentation of ssh:// urls. + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +Subject: [ANNOUNCE] GIT 1.4.1.1 +From: Junio C Hamano +Date: 2006-07-25 3:53:29 + +The latest maintenance release GIT 1.4.1.1 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.1.1.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.1.1.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.1.1.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.1.1-1.$arch.rpm (RPM) + +The primary purpose of this release is to fix the breakage +people reported while cloning large quantity of data via git +protocol, and the server side incorrectly timing out. I am very +sorry for the breakage. + +A big thanks goes to Matthias Lederhofer who fixed the breakage +for us. The fix was cherry-picked from the "master" branch. + +The "master" branch has the same fix already and we will have an +1.4.2-rc2 sometime this week, hopefully soon. + +---------------------------------------------------------------- + +Changes since v1.4.1 are as follows: + +Junio C Hamano: + Makefile: tighten git-http-{fetch,push} dependencies + +Linus Torvalds: + revision.c: fix "dense" under --remove-empty + +Matthias Lederhofer: + upload-pack: fix timeout in create_pack_file + +Robin Rosenberg: + Empty author may be presented by svn as an empty string or a null value. + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +From: Junio C Hamano +To: git@vger.kernel.org +Subject: [ANNOUNCE] GIT 1.4.1 +Date: Sat, 01 Jul 2006 23:33:42 -0700 + +The latest feature release GIT 1.4.1 is available at the usual +places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.1.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.1.tar.{gz,bz2} (preformatted docs) + git-manpages-1.4.1.tar.{gz,bz2} (preformatted docs) + RPMS/$arch/git-*-1.4.1-1.$arch.rpm (RPM) + +As announced earlier, 1.4.1 is not just 1.4.0 plus bugfixes, but +also has enhancements from the "master" branch. + +---------------------------------------------------------------- + +Changes since v1.4.0 are as follows: + +Andre Noll: + object-refs: avoid division by zero + +Andreas Ericsson: + git wrapper: fix command name in an error message. + +David Woodhouse: + Log peer address when git-daemon called from inetd + +Dennis Stosberg: + Make t4101-apply-nonl bring along its patches + Make t8001-annotate and t8002-blame more portable + Fix t8001-annotate and t8002-blame for ActiveState Perl + Solaris needs inclusion of signal.h for signal() + Fix pkt-line.h to compile with a non-GCC compiler + Fix expr usage for FreeBSD + +Eric W. Biederman: + Don't parse any headers in the real body of an email message. + Fix git-format-patch -s + Check and document the options to prevent mistakes. + +Eric Wong: + git-svn: t0000: add -f flag to checkout + git-svn: fix handling of filenames with embedded '@' + git-svn: eol_cp corner-case fixes + git-svn: restore original LC_ALL setting (or unset) for commit + git-svn: don't allow commit if svn tree is not current + git-svn: support -C passing to git-diff-tree + git-svn: --branch-all-refs / -B support + git-svn: optimize --branch and --branch-all-ref + git-svn: support manually placed initial trees from fetch + git-svn: Move all git-svn-related paths into $GIT_DIR/svn + git-svn: minor cleanups, extra error-checking + git-svn: add --repack and --repack-flags= options + git-svn: add --shared and --template= options to pass to init-db + git-svn: add some functionality to better support branches in svn + git-svn: add UTF-8 message test + git-svn: add 'log' command, a facsimile of basic `svn log' + git-svn: add support for Perl SVN::* libraries + git-svn: make the $GIT_DIR/svn/*/revs directory obsolete + git-svn: avoid creating some small files + git-svn: fix several small bugs, enable branch optimization + git-svn: Eliminate temp file usage in libsvn_get_file() + git-svn: bugfix and optimize the 'log' command + git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale + git-svn: svn (command-line) 1.0.x compatibility + git-svn: rebuild convenience and bugfixes + git-svn: fix --rmdir when using SVN:: libraries + rebase: Allow merge strategies to be used when rebasing + rebase: error out for NO_PYTHON if they use recursive merge + git-svn: fix commit --edit flag when using SVN:: libraries + rebase: allow --merge option to handle patches merged upstream + rebase: cleanup rebasing with --merge + rebase: allow --skip to work with --merge + git-svn: SVN 1.1.x library compatibility + git-svn: several graft-branches improvements + git-svn: add the commit-diff command + git-svn: add --follow-parent and --no-metadata options to fetch + git-svn: be verbose by default on fetch/commit, add -q/--quiet option + rebase: get rid of outdated MRESOLVEMSG + rebase: check for errors from git-commit + git-svn: allow a local target directory to be specified for init + +Florian Forster: + gitweb: Adding a `blame' interface. + gitweb: Make the `blame' interface in gitweb optional. + Remove ranges from switch statements. + Initialize FAMs using `FLEX_ARRAY'. + Don't instantiate structures with FAMs. + Cast pointers to `void *' when used in a format. + Don't use empty structure initializers. + Change types used in bitfields to be `int's. + Remove all void-pointer arithmetic. + +Fredrik Kuivinen: + blame: Add --time to produce raw timestamps + +Jakub Narebski: + Update gitweb README: gitweb is now included with git + Move gitweb style to gitweb.css + gitweb: safely output binary files for 'blob_plain' action + gitweb: text files for 'blob_plain' action without charset by default + Fix gitweb stylesheet + Make CSS file gitweb/gitweb.css more readable + gitweb: add type="text/css" to stylesheet link + Fix: Support for the standard mime.types map in gitweb + gitweb: A couple of page title tweaking + gitweb: style done with stylesheet + gitweb: whitespace cleanup + Add git version to gitweb output + Move $gitbin earlier in gitweb.cgi + gitweb: Make use of $PATH_INFO for project parameter + gitweb: whitespace cleanup around '=' + +Jeff King: + git-commit: allow -e option anywhere on command line + quote.c: silence compiler warnings from EMIT macro + +Johannes Schindelin: + diff options: add --color + Initialize lock_file struct to all zero. + Fix setting config variables with an alternative GIT_CONFIG + Read configuration also from $HOME/.gitconfig + repo-config: Fix late-night bug + git_config: access() returns 0 on success, not > 0 + patch-id: take "commit" prefix as well as "diff-tree" prefix + Teach diff about -b and -w flags + cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch} + apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag. + add diff_flush_patch_id() to calculate the patch id + format-patch: introduce "--ignore-if-in-upstream" + t4014: fix for whitespace from "wc -l" + format-patch: use clear_commit_marks() instead of some ad-hockery + Save errno in handle_alias() + +Junio C Hamano: + read-tree: --prefix=/ option. + write-tree: --prefix= + read-tree: reorganize bind_merge code. + fetch-pack: give up after getting too many "ack continue" + Fix earlier mismerges. + shared repository: optionally allow reading to "others". + gitk: rereadrefs needs listrefs + fix git alias + t5100: mailinfo and mailsplit tests. + mailinfo: ignore blanks after in-body headers. + fix rfc2047 formatter. + xdiff: minor changes to match libxdiff-0.21 + Restore SIGCHLD to SIG_DFL where we care about waitpid(). + checkout -f: do not leave untracked working tree files. + upload-pack: avoid sending an incomplete pack upon failure + upload-pack: prepare for sideband message support. + Retire git-clone-pack + upload-pack/fetch-pack: support side-band communication + Add renaming-rebase test. + daemon: send stderr to /dev/null instead of closing. + rebase --merge: fix for rebasing more than 7 commits. + Makefile: do not force unneeded recompilation upon GIT_VERSION changes + Makefile: do not recompile main programs when libraries have changed. + usage: minimum type fix. + git-pull: abort when fmt-merge-msg fails. + git-merge --squash + diff --color: use reset sequence when we mean reset. + repo-config: fix printing of bool + diff --color: use $GIT_DIR/config + git-repack: Be careful when updating the same pack as an existing one. + t4014: add format-patch --ignore-if-in-upstream test + combine-diff.c: type sanity + connect.c: remove unused parameters from tcp_connect and proxy_connect + connect.c: check the commit buffer boundary while parsing. + t/README: start testing porcelainish + checkout -m: fix read-tree invocation + t4014: fix test commit labels. + diff.c: fix get_patch_id() + Racy GIT (part #3) + upload-pack.c: includes on OpenBSD 3.8 + +Linus Torvalds: + gitweb.cgi history not shown + Shrink "struct object" a bit + Move "void *util" from "struct object" into "struct commit" + Some more memory leak avoidance + Remove "refs" field from "struct object" + Add specialized object allocator + Add "named object array" concept + Fix grow_refs_hash() + Tweak diff colors + Do not try futile object pairs when repacking. + Abstract out accesses to object hash array + revision.c: --full-history fix. + git object hash cleanups + +Lukas Sandström: + Make git-write-tree a builtin + Make git-mailsplit a builtin + Make git-mailinfo a builtin + Make git-stripspace a builtin + Make git-update-index a builtin + Make git-update-ref a builtin + +Martin Langhoff: + cvsimport: ignore CVSPS_NO_BRANCH and impossible branches + cvsimport: complete the cvsps run before starting the import + cvsimport: keep one index per branch during import + git-repack -- respect -q and be quiet + cvsimport: setup indexes correctly for ancestors and incremental imports + cvsimport - cleanup of the multi-indexes handling + +Matthias Kestenholz: + add GIT-CFLAGS to .gitignore + +Matthias Lederhofer: + correct documentation for git grep + +Nicolas Pitre: + consider previous pack undeltified object state only when reusing delta data + don't load objects needlessly when repacking + +Paul Eggert: + date.c: improve guess between timezone offset and year. + +Paul Mackerras: + Fix PPC SHA1 routine for large input buffers + +Peter Eriksen: + Implement safe_strncpy() as strlcpy() and use it more. + Rename safe_strncpy() to strlcpy(). + +Petr Baudis: + Support for extracting configuration from different files + Support for the standard mime.types map in gitweb + Customizable error handlers + Fix errno usage in connect.c + +Rene Scharfe: + git-tar-tree: Simplify write_trailer() + git-tar-tree: documentation update + git-tar-tree: no more void pointer arithmetic + Make release tarballs friendlier to older tar versions + +Robin Rosenberg: + Minor documentation fixup. + +Sean Estabrooks: + Add a "--notags" option for git-p4import. + +Sven Verdoolaege: + git-cvsexportcommit.perl: fix typo + +Timo Hirvonen: + gitweb: Use $hash_base as $search_hash if possible + git-merge: Don't use -p when outputting summary + Clean up diff.c + Make some strings const + +Uwe Zeisberger: + Fix possible out-of-bounds array access + +Yakov Lerner: + auto-detect changed prefix and/or changed build flags + Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used. + +Yann Dirson: + git-commit: filter out log message lines only when editor was run. + +- +To unsubscribe from this list: send the line "unsubscribe git" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + +From: Junio C Hamano +To: git@vger.kernel.org +Subject: [ANNOUNCE] GIT 1.4.0 +Date: Sat, 10 Jun 2006 14:16:46 -0700 + +The latest feature release GIT 1.4.0 is available at the +usual places: + + http://www.kernel.org/pub/software/scm/git/ + + git-1.4.0.tar.{gz,bz2} (tarball) + git-htmldocs-1.4.0.tar.{gz,bz2} (preformatted documentation) + git-manpages-1.4.0.tar.{gz,bz2} (preformatted documentation) + RPMS/$arch/git-*-1.4.0-1.$arch.rpm (RPM) + +This is a significant update since v1.3.0 (and v1.3.3 which is +the same codebase with bugfixes-only). User visible changes +are: + + - Many commands are now coded in C instead of implemented as + shell scripts. + + - Checkout is more careful not to clobber untracked files. + + - You can "alias" git commands with leading arguments in your + configuration file. + + - Documentation set, especially the tutorial, has been reworked. + + - Comes with the latest gitk, gitweb, and contributed software. + +---------------------------------------------------------------- + +Changes since v1.3.0 are as follows: + +Alex Riesen: + make update-index --chmod work with multiple files and --stdin + remove superflous "const" + +Aneesh Kumar K.V: + gitview: Add key binding for F5. + gitview: Move the console error messages to message dialog + gitview: Add some useful keybindings. + +Ben Clifford: + include header to define uint32_t, necessary on Mac OS X + +Björn Engelmann: + remove the artificial restriction tagsize < 8kb + add more informative error messages to git-mktag + +Catalin Marinas: + Add a test-case for git-apply trying to add an ending line + +Christian Couder: + Builtin git-rev-parse. + +Dennis Stosberg: + Fix git-pack-objects for 64-bit platforms + Fix compilation on newer NetBSD systems + git-write-tree writes garbage on sparc64 + git-clean fails on files beginning with a dash + Update documentation for git-format-patch + +Dmitry V. Levin: + Separate object name errors from usage errors + execv_git_cmd: Fix stack buffer overflow. + git_exec_path, execv_git_cmd: ignore empty environment variables + +Elrond: + git-cvsimport: Handle "Removed" from pserver + +Eric W. Biederman: + Implement git-quiltimport + Implement a --dry-run option to git-quiltimport + Make read_one_header_line return a flag not a length. + Move B and Q decoding into check header. + Refactor commit messge handling. + In handle_body only read a line if we don't already have one. + More accurately detect header lines in read_one_header_line + Allow in body headers beyond the in body header prefix. + +Eric Wong: + git-svn: documentation updates + git-svn 1.0.0 + apply: fix infinite loop with multiple patches with --index + send-email: address expansion for common mailers + Install git-send-email by default + send-email: allow sendmail binary to be used instead of SMTP + send-email: quiet some warnings, reject invalid addresses + Install git-send-email by default + commit: allow --pretty= args to be abbreviated + git-svn: starting a 1.1.0-pre development version + git-svn: ignore expansion of svn:keywords + t3300-funny-names: shell portability fixes + tests: Remove heredoc usage inside quotes + t5500-fetch-pack: remove local (bashism) usage. + t6000lib: workaround a possible dash bug + git-svn: t0001: workaround a heredoc bug in old versions of dash + git-svn: remove assertion that broke with older versions of svn + +Florian Forster: + git-svnimport: Improved detection of merges. + +Francis Daly: + Some doc typo fixes + config.txt grammar, typo, and asciidoc fixes + git-cvsserver asciidoc formatting tweaks + +Fredrik Kuivinen: + blame: Fix path pruning + Update the documentation for git-merge-base + +Horst H. von Brand: + Documentation: Spelling fixes + Cleanup git-send-email.perl:extract_valid_email + Add example xinetd(8) configuration to Documentation/everyday.txt + Fix Documentation/everyday.txt: Junio's workflow + Fix formatting of Documentation/git-clone.txt + +Horst von Brand: + Fix some documentation typoes + +Huw Davies: + git-format-patch: Use rfc2822 compliant date. + +J. Bruce Fields: + tutorial: replace "whatchanged" by "log" + tutorial: expanded discussion of commit history + tutorial: add discussion of index file, object database + documentation: mention gitk font adjustment in tutorial + documentation: add brief mention of cat-file to tutorial part I + Documentation: retitle the git-core tutorial + Documentation: fix a tutorial-2 typo + +Jeff King: + cvsimport: use git-update-index --index-info + cvsimport: cleanup commit function + cvsimport: set up commit environment in perl instead of using env + cat-file: document -p option + cvsimport: avoid "use" with :tag + handle concurrent pruning of packed objects + sha1_file: avoid re-preparing duplicate packs + +Jim Meyering: + Don't write directly to a make target ($@). + +Johannes Schindelin: + builtin-push: resurrect parsing of Push: lines + cache-tree: replace a sscanf() by two strtol() calls + builtin-push: also ask config for remote information + fetch, pull: ask config for remote information + repo-config: fix segfault with no argument. + repo-config: trim white-space before comment + repo-config: support --get-regexp + repo-config: deconvolute logics + fetch, pull: ask config for remote information + Add a conversion tool to migrate remote information into the config + builtin-push: --all and --tags _are_ explicit refspecs + Teach fmt-patch to write individual files. + fmt-patch: output file names to stdout + fmt-patch: implement -o + Teach fmt-patch about --numbered + Teach fmt-patch about --keep-subject + repo-config: trim white-space before comment + fmt-patch: understand old notation + Fix users of prefix_path() to free() only when necessary + Fix users of prefix_path() to free() only when necessary + Fix crash when reading the empty tree + diff family: add --check option + fmt-patch: Support --attach + git-format-patch --start-number + send-email: only 'require' instead of 'use' Net::SMTP + format-patch: resurrect extra headers from config + If you have a config containing something like this: + +Jon Loeliger: + Alphabetize the glossary. + Added definitions for a few words: + Add a few more words to the glossary. + Refactor git_tcp_connect() functions a little. + +Jonas Fonseca: + Fix filename scaling for binary files + Misc doc improvements + Document git-ls-tree --fullname + +Josef Weidendorfer: + gitk: Add a visual tag for remote refs + +Junio C Hamano: + Fix up default abbrev in setup_revisions() argument parser. + Fix up rev-list option parsing. + Split init_revisions() out of setup_revisions() + rev-list option parser fix. + Built-in git-whatchanged. + Do not fork PAGER=cat + Simplify common default options setup for built-in log family. + log/whatchanged/show - log formatting cleanup. + rev-list --header: output format fix + git.c: LOGSIZE is unused after log printing cleanup. + combine-diff: show diffstat with the first parent. + Fix "git log --stat": make sure to set recursive with --stat. + Tentative built-in format-patch. + sha1_name.c: prepare to make get_tree_entry() reusable from others. + sha1_name.c: no need to include diff.h; tree-walk.h will do. + get_tree_entry(): make it available from tree-walk + Minor tweak on subject line in --pretty=email + git-merge: a bit more readable user guidance. + pre-commit hook: complain about conflict markers. + diff: move diff.c to diff-lib.c to make room. + Add git-unresolve ... + diff --stat: do not drop rename information. + git-update-index --unresolve + git-commit --amend: two fixes. + rename internal format-patch wip + pack-objects: do not stop at object that is "too small" + mailinfo: decode underscore used in "Q" encoding properly. + Makefile: dependency for builtin-help.o + Add colordiff for git to contrib/colordiff. + Fix "git show --stat" + Libify diff-files. + Libify diff-index. + git-fmt-patch: thinkofix to show properly. + Libified diff-index: backward compatibility fix. + read-cache/write-cache: optionally return cache checksum SHA1. + Add cache-tree. + Update write-tree to use cache-tree. + Invalidate cache-tree entries for touched paths in git-apply. + Use cache-tree in update-index. + Add test-dump-cache-tree + cache-tree: protect against "git prune". + index: make the index file format extensible. + Teach fsck-objects about cache-tree. + cache-tree: sort the subtree entries. + test-dump-cache-tree: report number of subtrees. + Makefile: remove and create libgit.a from scratch. + diff --stat: show complete rewrites consistently. + git-cvsserver: typofixes + t0000-basic: Add ls-tree recursive test back. + Makefile: remove and create xdiff library from scratch. + commit-tree: allow generic object name for the tree as well. + rebase: typofix. + commit-tree.c: check_valid() microoptimization. + revision parsing: make "rev -- paths" checks stronger. + t0000-basic: more commit-tree tests. + update-index: when --unresolve, smudge the relevant cache-tree entries. + read-tree: teach 1 and 2 way merges about cache-tree. + read-tree: teach 1-way merege and plain read to prime cache-tree. + diff-index: fix compilation warnings. + verify-pack: check integrity in a saner order. + cache_tree_update: give an option to update cache-tree only. + test-dump-cache-tree: validate the cached data as well. + pack-objects: update size heuristucs. + built-in count-objects. + cache-tree.c: typefix + git-am --resolved: more usable error message. + built-in diff. + built-in diff: assorted updates. + builtin-diff.c: die() formatting type fix. + Fix builtin-push to honor Push: lines in remotes file. + Extended SHA1 -- "rev^@" syntax to mean "all parents" + get_sha1(): :path and :[0-3]:path to extract from index. + built-in "git grep" + Use RFC2822 dates from "git fmt-patch". + builtin-grep: wildcard pathspec fixes + builtin-grep: support '-l' option. + builtin-grep: do not use setup_revisions() + fsck-objects: mark objects reachable from cache-tree + builtin-count-objects: make it official. + builtin-diff: call it "git-diff", really. + builtin-log/whatchanged/show: make them official. + show-branch: omit uninteresting merges. + builtin-push: make it official. + builtin-grep: printf %.*s length is int, not ptrdiff_t. + Revert "fetch, pull: ask config for remote information" + builtin-grep: allow - and -[ABC] notation for context lines. + builtin-grep: allow more than one patterns. + builtin-grep: support -c (--count). + builtin-grep: support -w (--word-regexp). + builtin-grep: tighten path wildcard vs tree traversal. + core.prefersymlinkrefs: use symlinks for .git/HEAD + repo-config: readability fixups. + builtin-count-objects: open packs when running -v + Fix test-dump-cache-tree in one-tree disappeared case. + read-tree: invalidate cache-tree entry when a new index entry is added. + cache-tree: a bit more debugging support. + builtin-grep: terminate correctly at EOF + builtin-grep: binary files -a and -I + fsck-objects: do not segfault on missing tree in cache-tree + builtin-grep: -L (--files-without-match). + Makefile: do not link rev-list any specially. + delta: stricter constness + core.prefersymlinkrefs: use symlinks for .git/HEAD + pack-object: squelch eye-candy on non-tty + binary patch. + binary diff: further updates. + update-index --unresolve: work from a subdirectory. + checkout-index: plug memory leak from prefix_path() + update-index: plug memory leak from prefix_path() + update-index --again + update-index --again: take optional pathspecs + binary diff and apply: testsuite. + repo-config: document what value_regexp does a bit more clearly. + Fix repo-config set-multivar error return path. + Teach -f option to builtin-grep. + builtin-grep: documentation + Documentation: {caret} fixes (git-rev-list.txt) + get_sha1() - fix infinite loop on nonexistent stage. + Teach git-clean optional ... parameters. + builtin-grep: tighten argument parsing. + builtin-grep: typofix + builtin-grep: -w fix + builtin-grep: -F (--fixed-strings) + checkout: use --aggressive when running a 3-way merge (-m). + checkout: use --aggressive when running a 3-way merge (-m). + diffstat rename squashing fix. + read-tree -u one-way merge fix to check out locally modified paths. + apply --numstat: show new name, not old name. + Fix pack-index issue on 64-bit platforms a bit more portably. + builtin-grep: unparse more command line options. + apply --cached: apply a patch without using working tree. + git-am: use apply --cached + builtin-diff: fix comparison between two blobs. + merge-base: Clarify the comments on post processing. + read-tree -m -u: do not overwrite or remove untracked working tree files. + builtin-grep: workaround for non GNU grep. + Revert "builtin-grep: workaround for non GNU grep." + apply --cached: do not check newly added file in the working tree + builtin-add: fix unmatched pathspec warnings. + builtin-diff: do not say files are renamed when blob and file are given + Fix build procedure for builtin-init-db + built-in tar-tree and remote tar-tree + git-format-patch: now built-in. + checkdiff_consume: strtol parameter fix. + git-rebase: use canonical A..B syntax to format-patch + tutorial-2: typofix in examples. + mailinfo: skip bogus UNIX From line inside body + CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. + builtin format-patch: squelch content-type for 7-bit ASCII + diff: minor option combination fix. + fetch-pack: output refs in the order they were given on the command line. + Tutorial #2: broken link fix. + builtin-rm: squelch compiler warnings. + cvsimport: do not barf on creation of an empty file. + apply: force matching at the beginning. + fetch.c: remove an unused variable and dead code. + ls-remote: fix rsync:// to report HEAD + mailinfo: More carefully parse header lines in read_one_header_line() + gitk: start-up bugfix + built-in format-patch: various fixups. + format-patch: -n and -k are mutually exclusive. + Let git-clone to pass --template=dir option to git-init-db. + git-fetch: avoid using "case ... in (arm)" + adjust to the rebased series by Linus. + send-email: do not pass bogus address to local sendmail binary + format-patch --signoff + fetch.c: do not pass uninitialized lock to unlock_ref(). + fetch.c: do not call process_tree() from process_tree(). + fetch: do not report "same" unless -verbose. + read-tree --reset: update working tree file for conflicted paths. + git alias: try alias last. + rev-parse: tighten constness properly. + send-email: be more lenient and just catch obvious mistakes. + send-email: a bit more careful domain regexp. + git-format-patch: add --output-directory long option again + HTTP cleanup + Make index file locking code reusable to others. + refs.c: convert it to use lockfile interface. + ref-log: style fixes. + Documentation: add missing docs make check-docs found. + make clean: remove dist-doc targets. + Documentation: git-ls-tree (typofix) + Documentation: add another example to git-ls-files + git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin + git-rm: honor -n flag. + builtin-init-db: spell the in-program configuration variable in lowercase. + shared repository - add a few missing calls to adjust_shared_perm(). + git-clone: fix --bare over dumb-http + GIT 1.4.0 + +Linus Torvalds: + Common option parsing for "git log --diff" and friends + Tentative built-in "git show" + Fixes for option parsing + Log message printout cleanups + Log message printout cleanups (#2) + Log message printout cleanups (#3): fix --pretty=oneline + Fix uninteresting tags in new revision parsing + get_sha1() shorthands for blob/tree objects + Allow "git repack" users to specify repacking window/depth + git log: don't do merge diffs by default + git-log produces no output + Split up builtin commands into separate files from git.c + Fix filename verification when in a subdirectory + Fix "git help -a" terminal autosizing + git builtin "push" + Fix "git-log --parents" breakage post v1.3.0 + sha1_to_hex() usage cleanup + Fix "git diff --stat" with long filenames + revert/cherry-pick: use aggressive merge. + git config syntax updates + git diff: support "-U" and "--unified" options properly + Allow one-way tree merge to remove old files + Simplify "git reset --hard" + builtin-grep: use external grep when we can take advantage of it + read-tree --reset -u fix. + Fix silly typo in new builtin grep + Remove old "git-grep.sh" remnants + libify git-ls-files directory traversal + Clean up git-ls-file directory walking library interface + Do "git add" as a builtin + builtin-add: warn on unmatched pathspecs + builtin-grep: workaround for non GNU grep. + Remove old "git-add.sh" remnants + Prevent bogus paths from being added to the index. + Make "git rev-list" be a builtin + Libify the index refresh logic + Move pathspec matching from builtin-add.c into dir.c + Add builtin "git rm" command + cvsimport: repack every kilo-commits. + apply: treat EOF as proper context. + Clean up sha1 file writing + bogus "fatal: Not a git repository" + t1002: use -U0 instead of --unified=0 + Fix "--abbrev=xyz" for revision listing + Fix memory leak in "git rev-list --objects" + Don't use "sscanf()" for tree mode scanning + Add raw tree buffer info to "struct tree" + Make "tree_entry" have a SHA1 instead of a union of object pointers + Switch "read_tree_recursive()" over to tree-walk functionality + Remove "tree->entries" tree-entry list from tree parser + Make "struct tree" contain the pointer to the tree buffer + Make "tree_entry" have a SHA1 instead of a union of object pointers + Switch "read_tree_recursive()" over to tree-walk functionality + builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec() + Remove "tree->entries" tree-entry list from tree parser + fsck-objects: avoid unnecessary tree_entry_list usage + Remove unused "zeropad" entry from tree_list_entry + Convert "mark_tree_uninteresting()" to raw tree walker + Convert fetch.c: process_tree() to raw tree walker + Remove last vestiges of generic tree_entry_list + tree_entry(): new tree-walking helper function + read-tree: fix eye-candy. + Fix typo in tutorial-2.txt + rev-list: fix process_tree() conversion. + pack-objects: improve path grouping heuristics. + +Lukas Sandström: + Make git-check-format-ref a builtin. + SubmittingPatches: The download location of External Editor has moved + +Martin Langhoff: + git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups. + git-send-email: fix version string to be valid perl + cvsserver: use git-rev-list instead of git-log + cvsserver: use git-rev-list instead of git-log + cvsimport: minor fixups + cvsimport: replace anonymous sub ref with a normal sub + cvsimport: introduce -L option to workaround memory leaks + cvsimport: introduce _fetchfile() method and used a 1M buffer to read() + +Martin Waitz: + clone: keep --reference even with -l -s + repack: honor -d even when no new pack was created + Transitively read alternatives + test case for transitive info/alternates + clone: don't clone the info/alternates file + git help: remove whatchanged from list of common commands + Documentation/Makefile: remove extra / + Add instructions to commit template. + +Martyn Smith: + Added logged warnings for CVS error returns + Many fixes for most operations in Eclipse. + Change to allow subdir updates from Eclipse + +Matthias Kestenholz: + annotate: fix warning about uninitialized scalar + annotate: display usage information if no filename was given + fix various typos in documentation + add documentation for update-index --unresolve + +Matthias Lederhofer: + core-tutorial.txt: escape asterisk + git status: skip empty directories, and add -u to show all untracked files + +Nick Hengeveld: + git-fetch: resolve remote symrefs for HTTP transport + http: prevent segfault during curl handle reuse + builtin-push: don't pass --thin to HTTP transport + HTTP cleanup + http-fetch: fix possible segfault + +Nicolas Pitre: + fix pack-object buffer size + split the diff-delta interface + use delta index data when finding best delta matches + replace adler32 with Rabin's polynomial in diff-delta + tiny optimization to diff-delta + improve diff-delta with sparse and/or repetitive data + improve base85 generated assembly code + fix diff-delta bad memory access + simple euristic for further free packing improvements + pack-object: slightly more efficient + improve depth heuristic for maximum delta size + +Paul Mackerras: + gitk: Implement multiple views + gitk: Make File->Update work properly again + gitk: Fix various bugs in the view support + gitk: Don't reread git-rev-list output from scratch on view switch + gitk: Remember the view in the history list + gitk: Let git-rev-list do the argument list parsing + gitk: Use git-rev-parse only to identify file/dir names on cmd line + rev-parse: better error message for ambiguous arguments + gitk: Implement "permanent" views (stored in ~/.gitk) + gitk: add menu item for editing the current view + gitk: Use a text widget for the file list + gitk: Add a tree-browsing mode + gitk: Basic support for highlighting one view within another + gitk: Fix file list display when files are renamed + gitk: Allow view to specify arbitrary arguments to git-rev-list + gitk: Fix display of "(...)" for parents/children we haven't drawn + Provide a way to flush git-diff-tree's output + gitk: Make a row of controls for controlling highlighting + gitk: Fix bug where page-up/down wouldn't always work properly + gitk: Highlight entries in the file list as well + gitk: Highlight paths of interest in tree view as well + gitk: First cut at a search function in the patch/file display window + gitk: Improve the text window search function + gitk: Move "pickaxe" find function to highlight facility + gitk: Fix bug in highlight stuff when no line is selected + gitk: show_error fix + gitk: Provide ability to highlight based on relationship to selected commit + Make git-diff-tree indicate when it flushes + gitk: Add a goto next/previous highlighted commit function + gitk: Show nearby tags + gitk: Show branch name(s) as well, if "show nearby tags" is enabled + gitk: Re-read the descendent/ancestor tag & head info on update + +Paul T Darga: + check for error return from fork() + +Pavel Roskin: + Release config lock if the regex is invalid + +Peter Eriksen: + Add git-quiltimport to .gitignore. + Builtin git-ls-files. + Builtin git-ls-tree. + Builtin git-tar-tree. + Builtin git-read-tree. + Builtin git-commit-tree. + Builtin git-apply. + Builtin git-show-branch. + Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. + +Peter Hagervall: + Sparse fix for builtin-diff + +Petr Baudis: + Document git-var -l listing also configuration variables + Document the configuration file + git-repo-config --list support + Deprecate usage of git-var -l for getting config vars list + Call builtin ls-tree in git-cat-file -p + Document git aliases support + Documentation: git aliases + +Rene Scharfe: + Off-by-one error in get_path_prefix(), found by Valgrind + Built-in git-get-tar-commit-id + +Robert Fitzsimons: + builtin-grep: pass ignore case option to external grep + +Robert Shearman: + Give the user a hint for how to continue in the case that git-am fails because it requires user intervention + +Ryan Anderson: + git-send-email: Add References: headers to emails, in addition to In-Reply-To: + Add support for --bcc to git-send-email. + Fix a bug in email extraction used in git-send-email. + Add a basic test case for git send-email, and fix some real bugs discovered. + +Salikh Zakirov: + Fixed Cygwin CR-munging problem in mailsplit + +Santi: + Document that "git add" only adds non-ignored files. + +Santi_Béjar: + Reintroduce svn pools to solve the memory leak. + +Sean Estabrooks: + Add --continue and --abort options to git-rebase. + Update the git-branch man page to include the "-r" option, + Fix up remaining man pages that use asciidoc "callouts". + Properly render asciidoc "callouts" in git man pages. + Fix trivial typo in git-log man page. + Several trivial documentation touch ups. + Fix up docs where "--" isn't displayed correctly. + Update git-unpack-objects documentation. + Clarify git-cherry documentation. + Fix for config file section parsing. + Another config file parsing fix. + t1300-repo-config: two new config parsing tests. + Another config file parsing fix. + Add "--branches", "--tags" and "--remotes" options to git-rev-parse. + Ensure author & committer before asking for commit message. + Make git rebase interactive help match documentation. + Add "--summary" option to git diff. + Convert some "apply --summary" users to "diff --summary". + Strip useless "tags/" prefix from git-tag -l output + Allow pickaxe and diff-filter options to be used by git log. + Avoid segfault in diff --stat rename output. + Change GIT-VERSION-GEN to call git commands with "git" not "git-". + Install git builtins into gitexecdir rather than bindir. + Remove possible segfault in http-fetch. + --summary output should print immediately after stats. + A Perforce importer for git. + +Serge E. Hallyn: + socksetup: don't return on set_reuse_addr() error + socksetup: don't return on set_reuse_addr() error + +Sergey Vlasov: + gitk: Display commit messages with word wrap + +Shawn Pearce: + Document git-clone --reference + Remove unnecessary local in get_ref_sha1. + Improve abstraction of ref lock/write. + Convert update-ref to use ref_lock API. + Log ref updates to logs/refs/ + Support 'master@2 hours ago' syntax + Fix ref log parsing so it works properly. + General ref log reading improvements. + Added logs/ directory to repository layout. + Force writing ref if it doesn't exist. + Log ref updates made by fetch. + Change 'master@noon' syntax to 'master@{noon}'. + Correct force_write bug in refs.c + Change order of -m option to update-ref. + Include ref log detail in commit, reset, etc. + Create/delete branch ref logs. + Enable ref log creation in git checkout -b. + Reference git-check-ref-format in git-branch. + Elaborate on why ':' is a bad idea in a ref name. + Built git-upload-tar should be ignored. + Verify git-commit provides a reflog message. + Test that git-branch -l works. + Remove unnecessary output from t3600-rm. + Improved pack format documentation. + Allow multiple -m options to git-commit. + +Tilman Sauerbeck: + Documentation/Makefile: create tarballs for the man pages and html files + +Timo Hirvonen: + Builtin git-init-db + Builtin git-cat-file + gitk: Replace "git-" commands with "git " + +Uwe Zeisberger: + Document git-clone --use-separate-remote + +Yakov Lerner: + read-cache.c: use xcalloc() not calloc() + NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin). + Problem: 'trap...exit' causes error message when /bin/sh is ash. + +Yann Dirson: + Do not call 'cmp' with non-existant -q flag. + Document current cvsexportcommit limitations. + Make cvsexportcommit create parent directories as needed. + --- git-core-1.4.4.2.orig/debian/control +++ git-core-1.4.4.2/debian/control @@ -0,0 +1,145 @@ +Source: git-core +Section: devel +Priority: optional +Maintainer: Gerrit Pape +Build-Depends: libz-dev, libcurl3-gnutls-dev | libcurl3-dev, python, asciidoc (>> 7.0.2-3), xmlto, libexpat1-dev, rcs, subversion, libsvn-perl | libsvn-core-perl, unzip +Standards-Version: 3.7.2.0 + +Package: git-core +Architecture: any +Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl, rcs +Recommends: git-doc, patch, less, rsync, curl, ssh-client, python +Suggests: git-arch, git-cvs, git-svn, git-email, git-daemon-run, gitk, gitweb, cogito +Replaces: cogito (<< 0.16rc2-0) +Conflicts: git (<< 4.3.20-8) +Description: content addressable filesystem + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides the git core components. + +Package: git-doc +Section: doc +Architecture: all +Suggests: git-core, git-arch, git-cvs, git-svn, git-email, gitk, gitweb +Description: content addressable filesystem (documentation) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides the documentation. + +Package: git-arch +Architecture: all +Depends: git-core (= ${Source-Version}) +Recommends: git-doc +Suggests: tla, bazaar +Replaces: cogito (<< 0.16rc2-0) +Description: content addressable filesystem (arch interoperability) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides tools for importing development history from arch + repositories. + +Package: git-cvs +Architecture: all +Depends: git-core (= ${Source-Version}), cvsps (>> 2.1-0) +Recommends: git-doc +Suggests: cvs +Replaces: cogito (<< 0.16rc2-0) +Description: content addressable filesystem (cvs interoperability) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides tools for importing development history from cvs + repositories. + +Package: git-svn +Architecture: all +Depends: git-core (= ${Source-Version}), libsvn-perl | libsvn-core-perl, libwww-perl +Recommends: git-doc +Suggests: subversion +Replaces: cogito (<< 0.16rc2-0) +Description: content addressable filesystem (svn interoperability) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides tools for importing development history from + subversion repositories. + +Package: git-email +Architecture: all +Depends: git-core (= ${Source-Version}), libmail-sendmail-perl, libemail-valid-perl +Recommends: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: content addressable filesystem (email add-on) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides tools for sending series of patch emails. + +Package: git-daemon-run +Architecture: all +Depends: git-core (= ${Source-Version}), runit, adduser +Description: content addressable filesystem (git-daemon service) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides a git-daemon service. + +Package: gitk +Architecture: all +Depends: git-core (= ${Source-Version}), tk8.4 +Recommends: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: content addressable filesystem (revision tree visualizer) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides the gitk program, a tcl/tk revision tree visualizer. + +Package: gitweb +Architecture: all +Depends: git-core (= ${Source-Version}), perl +Recommends: git-doc +Description: content addressable filesystem (web interface) + This is a stupid (but extremely fast) directory content manager. It + doesn't do a whole lot, but what it 'does' do is track directory + contents efficiently. + . + Amongst other projects, the Linux kernel source tree is managed through + the git content manager. + . + This package provides a web interface for browsing git repositories. --- git-core-1.4.4.2.orig/debian/gitweb.conf +++ git-core-1.4.4.2/debian/gitweb.conf @@ -0,0 +1,23 @@ +# path to git projects (.git) +$projectroot = "/var/cache/git"; + +# directory to use for temp files +$git_temp = "/tmp"; + +# target of the home link on top of all pages +$home_link = $my_uri; + +# html text to include at home page +$home_text = "indextext.html"; + +# file with project list; by default, simply scan the projectroot dir. +$projects_list = $projectroot; + +# stylesheet to use +$stylesheet = "/gitweb.css"; + +# logo to use +$logo = "/git-logo.png"; + +# the 'favicon' +$favicon = "/git-favicon.png"; --- git-core-1.4.4.2.orig/debian/copyright +++ git-core-1.4.4.2/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Sebastian Kuzminsky +on Thu, 5 May 2005 10:27:14 -0600, +and was adopted by Gerrit Pape +on Wed, 16 Nov 2005 19:37:14 +0000. + +The gitweb package was debianized by Andres Salomon +on Fri, 20 May 2005 11:23:12 -0400, +and adopted to be included in this package +on Thu, 27 Jul 2006 21:43:38 +0000. + +git-core was downloaded from http://www.kernel.org/pub/software/scm/git/ + +Upstream authors: Linus Torvalds and many others + +Copyright: + +This software is copyright (c) 2005, Linus Torvalds and others. + +You can redistribute this software and/or modify it under the terms of +the GNU General Public License as published by the Free Software +Foundation; version 2 dated June, 1991. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL-2 file. --- git-core-1.4.4.2.orig/debian/git-daemon-run.postinst +++ git-core-1.4.4.2/debian/git-daemon-run.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +getent passwd gitlog >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitlog + +# enable git-daemon service +test -e /var/service/git-daemon || test -h /var/service/git-daemon || \ + ln -s /etc/sv/git-daemon /var/service/ || exit 1 --- git-core-1.4.4.2.orig/debian/gitweb.README.Debian +++ git-core-1.4.4.2/debian/gitweb.README.Debian @@ -0,0 +1,15 @@ +gitweb for Debian +----------------- + +The gitweb CGI by default looks into the directory /var/cache/git/ for +browsable repositories (this is configured in /etc/gitweb.conf). It expects +the repositories' .git subdirectories in /var/cache/git/, symlinks pointing +to the corresponding subdirectories in the repositories are just fine, e.g.: + + ln -s ~pape/git/foo/.git /var/cache/git/foo.git + +For more details about setting up gitweb for a git.example.org server, and +on how to make the git-core tools such as git-clone work through http, see +/usr/share/doc/git-core/README.Debian- + + -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 --- git-core-1.4.4.2.orig/debian/rules +++ git-core-1.4.4.2/debian/rules @@ -0,0 +1,182 @@ +#!/usr/bin/make -f + +ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) + +CC =gcc +CFLAGS =-g -Wall +STRIP =strip +OPTS =NO_OPENSSL=1 WITH_SEND_EMAIL=1 WITH_OWN_SUBPROCESS_PY=1 \ + GITWEB_CONFIG=/etc/gitweb.conf prefix=/usr mandir=/usr/share/man \ + OPTIMIZE="-O2 -g -Wall" INSTALLDIRS=vendor + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: strip +endif +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS +=-O0 +else + CFLAGS +=-O2 +endif +ifeq (powerpc,$(ARCH)) + OPTS +=PPC_SHA1=1 +else +ifeq (arm,$(ARCH)) + OPTS +=ARM_SHA1=1 +endif +endif + +TMP =$(shell pwd)/tmp +GIT =$(shell pwd)/debian/git + +patch: deb-checkdir patch-stamp +patch-stamp: + for i in `ls -t debian/diff/*.diff || :`; do \ + patch -p1 <$$i || exit 1; \ + done + touch patch-stamp + +build: deb-checkdir build-arch-stamp build-indep-stamp +build-arch-stamp: patch-stamp + -gcc -v + DESTDIR='$(GIT)'-core $(MAKE) all test \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) + $(MAKE) -CDocumentation man + touch build-arch-stamp +build-indep-stamp: build-arch-stamp + $(MAKE) -CDocumentation man html + touch build-indep-stamp + +clean: deb-checkdir deb-checkuid + $(MAKE) clean + ! test -e patch-stamp || \ + for i in `ls -tr debian/diff/*.diff || :`; do patch -p1 -R <$$i; done + rm -rf '$(TMP)' + rm -f patch-stamp build-arch-stamp build-indep-stamp + rm -rf '$(GIT)'-core '$(GIT)'-doc '$(GIT)'-arch '$(GIT)'-cvs \ + '$(GIT)'-svn '$(GIT)'-email '$(GIT)'-daemon-run '$(GIT)'k '$(GIT)'web + rm -f debian/files debian/substvars changelog + +install: install-arch install-indep +install-arch: deb-checkdir deb-checkuid build-arch-stamp + # git-core + rm -rf '$(GIT)-core' + install -d -m0755 '$(GIT)'-core/usr/bin + DESTDIR='$(GIT)'-core $(MAKE) install install-doc \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) + install -d -m0755 '$(GIT)'-core/var/cache/git + rm -f '$(GIT)'-core/usr/share/perl5/Error.pm + rm -f '$(GIT)'-core/usr/share/man/man3/private-Error.3pm + rm -rf '$(GIT)'-core/usr/lib + chmod 644 '$(GIT)'-core/usr/share/perl5/Git.pm + # don't include arch, cvs, svn, email tools, and gitk program + for i in git-archimport git-cvs git-svn git-send-email gitk; do \ + rm -f '$(GIT)'-core/usr/bin/$$i*; \ + done + # handle git program through alternatives mechanism (see #342363), + # rename to git-scm + mv -f '$(GIT)'-core/usr/bin/git '$(GIT)'-core/usr/bin/git-scm + for i in '$(GIT)'-core/usr/bin/*; do \ + test "`head -c2 $$i`" = '#!' || $(STRIP) -R .comment -R .note $$i; \ + done + # don't include arch, cvs, svn, email, and gitk man pages + for i in git-archimport git-cvs git-svn git-send-email gitk; do \ + rm -f '$(GIT)'-core/usr/share/man/man1/$$i*; \ + done + chmod 0644 '$(GIT)'-core/usr/share/man/man?/*.[0-9]* + gzip -9 '$(GIT)'-core/usr/share/man/man?/*.[0-9]* + # contrib + install -d -m0755 '$(GIT)'-core/usr/share/doc/git-core + cp -R contrib '$(GIT)'-core/usr/share/doc/git-core/ + find '$(GIT)'-core/usr/share/doc/git-core/contrib -type f | \ + xargs chmod 0644 + # upstream changelog + test -r changelog || ln -s debian/changelog.upstream changelog + +install-indep: build-arch-stamp build-indep-stamp + rm -rf '$(TMP)' + install -d -m0755 '$(TMP)' + DESTDIR='$(TMP)' $(MAKE) install install-doc \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) + $(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \ + 2>/dev/null + # git-doc + rm -rf '$(GIT)'-doc + install -d -m0755 '$(GIT)'-doc + # git-cvs, git-svn + for i in cvs svn; do \ + rm -rf '$(GIT)'-$$i && \ + install -d -m0755 '$(GIT)'-$$i/usr/bin && \ + install -m0755 '$(TMP)'/usr/bin/git-$$i* '$(GIT)'-$$i/usr/bin/ && \ + install -d -m0755 '$(GIT)'-$$i/usr/share/man/man1 && \ + install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \ + '$(GIT)'-$$i/usr/share/man/man1/ && \ + gzip -9 '$(GIT)'-$$i/usr/share/man/man1/*.1 || exit 1; \ + done + # git-arch + rm -rf '$(GIT)'-arch + install -d -m0755 '$(GIT)'-arch/usr/bin + install -m0755 '$(TMP)'/usr/bin/git-archimport '$(GIT)'-arch/usr/bin/ + install -d -m0755 '$(GIT)'-arch/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/git-archimport.1 \ + '$(GIT)'-arch/usr/share/man/man1/ + gzip -9 '$(GIT)'-arch/usr/share/man/man1/*.1 + # git-email + rm -rf '$(GIT)'-email + install -d -m0755 '$(GIT)'-email/usr/bin + install -m0755 '$(TMP)'/usr/bin/git-send-email '$(GIT)'-email/usr/bin/ + install -d -m0755 '$(GIT)'-email/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/git-send-email.1 \ + '$(GIT)'-email/usr/share/man/man1/ + gzip -9 '$(GIT)'-email/usr/share/man/man1/*.1 + # git-daemon-run + rm -rf '$(GIT)'-daemon-run + install -d -m0755 '$(GIT)'-daemon-run/etc/sv/git-daemon/log + install -m0755 debian/git-daemon/run \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/run + install -m0755 debian/git-daemon/log/run \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/log/run + ln -s /var/run/sv.git-daemon \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/supervise + ln -s /var/run/sv.git-daemon.log \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/log/supervise + # gitk + rm -rf '$(GIT)'k + install -d -m0755 '$(GIT)'k/usr/bin + install -m0755 '$(TMP)'/usr/bin/gitk '$(GIT)'k/usr/bin/gitk + install -d -m0755 '$(GIT)'k/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/gitk.1 \ + '$(GIT)'k/usr/share/man/man1/ + gzip -9 '$(GIT)'k/usr/share/man/man1/*.1 + # gitweb + rm -rf '$(GIT)'web + install -d -m0755 '$(GIT)'web/usr/lib/cgi-bin + install -m0755 gitweb/gitweb.cgi '$(GIT)'web/usr/lib/cgi-bin/gitweb.cgi + install -d -m0755 '$(GIT)'web/var/www + install -m0644 gitweb/gitweb.css '$(GIT)'web/var/www/gitweb.css + install -m0644 gitweb/git-favicon.png \ + '$(GIT)'web/var/www/git-favicon.png + install -m0644 gitweb/git-logo.png '$(GIT)'web/var/www/git-logo.png + install -d -m0755 '$(GIT)'web/etc + install -m0644 debian/gitweb.conf '$(GIT)'web/etc/gitweb.conf + install -d -m0755 '$(GIT)'web/var/cache/git/ + # upstream changelog + test -r changelog || ln -s debian/changelog.upstream changelog + +binary: binary-arch binary-indep +binary-arch: install-arch git-core.deb + rm -f debian/substvars + dpkg-shlibdeps '$(GIT)'-core/usr/bin/* + dpkg-gencontrol -isp -pgit-core -P'$(GIT)'-core + dpkg -b '$(GIT)'-core .. +binary-indep: install-indep git-doc.deb git-arch.deb git-cvs.deb git-svn.deb \ + git-daemon-run.deb git-email.deb gitk.deb gitweb.deb + rm -f debian/substvars + for i in -doc -arch -cvs -svn -daemon-run -email k web; do \ + dpkg-gencontrol -isp -pgit$$i -P'$(GIT)'$$i && \ + dpkg -b '$(GIT)'$$i .. || exit 1; \ + done + +.PHONY: patch build clean install install-arch install-indep binary \ + binary-arch binary-indep + +include debian/implicit --- git-core-1.4.4.2.orig/debian/git-daemon-run.postrm +++ git-core-1.4.4.2/debian/git-daemon-run.postrm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +rm -rf /var/run/sv.git-daemon /var/run/sv.git-daemon.log +! getent passwd gitlog >/dev/null || deluser gitlog --- git-core-1.4.4.2.orig/debian/git-core.docs +++ git-core-1.4.4.2/debian/git-core.docs @@ -0,0 +1 @@ +README --- git-core-1.4.4.2.orig/debian/git-core.postinst +++ git-core-1.4.4.2/debian/git-core.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +update-alternatives --install /usr/bin/git git /usr/bin/git-scm 70 --- git-core-1.4.4.2.orig/debian/git-doc.docs +++ git-core-1.4.4.2/debian/git-doc.docs @@ -0,0 +1,2 @@ +tmp/html/* +Documentation/technical --- git-core-1.4.4.2.orig/debian/gitweb.conffiles +++ git-core-1.4.4.2/debian/gitweb.conffiles @@ -0,0 +1 @@ +/etc/gitweb.conf --- git-core-1.4.4.2.orig/debian/implicit +++ git-core-1.4.4.2/debian/implicit @@ -0,0 +1,93 @@ +# $Id: implicit,v 1.11 2005/11/29 21:57:55 pape Exp $ + +.PHONY: deb-checkdir deb-checkuid + +deb-checkdir: + @test -e debian/control || sh -cx '! : wrong directory' +deb-checkuid: + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb: %.deb-docs %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \ + $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \ + $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.udeb: %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ + $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.deb-checkdir: + @test -d debian/$* || sh -cx '! : directory debian/$* missing' + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb-docs-base: + : implicit + @rm -f debian/$*/usr/share/doc/$*/* || : + @install -d -m0755 debian/$*/usr/share/doc/$* + : debian/$*/usr/share/doc/$*/ + @sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/' + @sh -cx 'install -m0644 debian/changelog \ + debian/$*/usr/share/doc/$*/changelog.Debian' + @test ! -r changelog || \ + sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/' + @test -r debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ + debian/$*/usr/share/doc/$*/changelog' + @test -s debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' + @gzip -9 debian/$*/usr/share/doc/$*/changelog* +%.deb-docs-docs: + @for i in `cat debian/$*.docs 2>/dev/null || :`; do \ + if test -d $$i; then \ + sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \ + for j in $$i/*; do \ + sh -cx "install -m0644 $$j \ + debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \ + done || exit 1; \ + continue; \ + fi; \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \ + done + @test ! -r debian/$*.README.Debian || \ + sh -cx 'install -m0644 debian/$*.README.Debian \ + debian/$*/usr/share/doc/$*/README.Debian' + @if test -r debian/$*.NEWS.Debian; then \ + sh -cx 'install -m0644 debian/$*.NEWS.Debian \ + debian/$*/usr/share/doc/$*/NEWS.Debian && \ + gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \ + fi +%.deb-docs-examples: + @rm -rf debian/$*/usr/share/doc/$*/examples + : debian/$*/usr/share/doc/$*/examples/ + @test ! -r debian/$*.examples || \ + install -d -m0755 debian/$*/usr/share/doc/$*/examples + @for i in `cat debian/$*.examples 2>/dev/null || :`; do \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \ + || exit 1; \ + done +%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples + : debian/$*/usr/share/doc/$*/ ok + +%.deb-DEBIAN-base: + @rm -rf debian/$*/DEBIAN + : debian/$*/DEBIAN/ + @install -d -m0755 debian/$*/DEBIAN + @for i in conffiles shlibs templates; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-scripts: + @for i in preinst prerm postinst postrm config; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-md5sums: + : debian/$*/DEBIAN/md5sums + @rm -f debian/$*/DEBIAN/md5sums + @cd debian/$* && find * -path 'DEBIAN' -prune -o \ + -type f -exec md5sum {} >>DEBIAN/md5sums \; +%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \ + %.deb-DEBIAN-md5sums + : debian/$*/DEBIAN/ ok --- git-core-1.4.4.2.orig/debian/git-daemon-run.conffiles +++ git-core-1.4.4.2/debian/git-daemon-run.conffiles @@ -0,0 +1,2 @@ +/etc/sv/git-daemon/run +/etc/sv/git-daemon/log/run --- git-core-1.4.4.2.orig/debian/examples/index.aux-generation +++ git-core-1.4.4.2/debian/examples/index.aux-generation @@ -0,0 +1,46 @@ +From: Matthew Wilcox +To: 383219@bugs.debian.org +Cc: Roland Mas +Subject: index.aux generation +Date: Thu, 24 Aug 2006 08:55:10 -0600 + +Alioth needs to generate an index.aux file. It'd be helpful if we had +an example script for doing this. Here's the script used for +git.infradead.org (MIT licence, says its author): + +--- cut --- +#!/bin/sh + +cd /home +for a in * ; do [ -r $a/public_git ] && [ ! -d /home/git/users/$a ] && ln -s /home/$a/public_git /home/git/users/$a ; done + +cd /home/git +ls */HEAD users/*/*/HEAD | grep ^[-./=+a-zA-Z0-9]*\$ | sed s:/HEAD\$:: | while read DIR ; do + TREEUID=`stat -c %U $DIR` + TREEUSERNAME=`grep ^$TREEUID: /etc/passwd | cut -f5 -d: | sed s/\ /+/` + if [ "$TREEUSERNAME" = "" ]; then + TREEUSERNAME=$TREEUID + fi + echo $DIR $TREEUSERNAME | sed s:/:%2F:g +done > /home/git/.index.aux.$$ + +mv /home/git/.index.aux.$$ /home/git/.index.aux + +--- cut --- + +I suspect Alioth wants something like (untested ...) + +cd /srv/git.debian.org/git +ls */*/HEAD | grep ^[-./=+a-zA-Z0-9]*\$ | sed s:/HEAD\$:: | while read DIR ; do + TREEUID=`stat -c %U $DIR` + TREEUSERNAME=`XXX` + if [ "$TREEUSERNAME" = "" ]; then + TREEUSERNAME=$TREEUID + fi + echo $DIR $TREEUSERNAME | sed s:/:%2F:g +done > /srv/git.debian.org/.index.aux.$$ + +mv /srv/git.debian.org/.index.aux.$$ /srv/git.debian.org/.index.aux + +where XXX would be how to turn a username into the name of a user. +I dunno how Alioth works; ldap or postgres db seem plausible answers. --- git-core-1.4.4.2.orig/debian/git-core.README.Debian +++ git-core-1.4.4.2/debian/git-core.README.Debian @@ -0,0 +1,63 @@ +git-core for Debian +------------------- + +When setting up a git.example.org server, there are several things to +configure to make everything work nicely together. All this is optional. + +1. Run a git-daemon. This allows people to use a git:// URL to access your +repositories. This package provides the git-daemon program, to enable a +git-daemon service, additionally install the git-daemon-run package: + + apt-get install git-daemon-run + +Wait five seconds for the service to be picked up, and check its status and +logs: + + sv stat git-daemon + cat /var/log/git-daemon/current + +The git daemon by default looks into the directory /var/cache/git/ for +repositories (this is configured in /etc/sv/git-daemon/run). It expects +the repositories' .git subdirectories in /var/cache/git/, symlinks pointing +to the corresponding subdirectories in the repositories are just fine, e.g.: + + ln -s ~pape/git/foo/.git /var/cache/git/foo.git + +Now git-clone git://git.example.org/git/repo will work. + +2. Install rsync. This allows people to use rsync:// URLs to access your +repositories. You then need to add a stanza to /etc/rsyncd.conf that looks +like this: + +[git] + path = /var/cache/git + readonly = yes + +Now git-clone rsync://git.example.org/git/repo will work. + +3. Configure a web server for git. This allows people to use a git:// URL +to access your repositories. + +Here's an example for an apache virtual server. Add a stanza to your apache +configuration that looks like this: + + + ServerName git.example.org + ServerAdmin webmaster@example.org + HeaderName HEADER + # bogus but safe DocumentRoot + DocumentRoot /var/cache/git + ErrorLog /var/log/apache-ssl/git.example.org-error.log + CustomLog /var/log/apache-ssl/git.example.org-access.log combined + Alias /robots.txt /var/www/cvs.robots.txt + Alias /gitweb.css /var/www/gitweb.css + Alias /git /var/git + ScriptAlias / /usr/lib/cgi-bin/gitweb.cgi + RedirectMatch permanent "^/~(.*)$" "http://example.org/~$1" + + +Now git-clone rsync://git.example.org/git/repo will work. And if you +installed the gitweb package, http://git.example.org/ now will display a +list of repositories, making them accessible through a web browser. + + -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 --- git-core-1.4.4.2.orig/debian/git-core.prerm +++ git-core-1.4.4.2/debian/git-core.prerm @@ -0,0 +1,5 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || exit 0 +update-alternatives --remove git /usr/bin/git-scm --- git-core-1.4.4.2.orig/debian/git-daemon/log/run +++ git-core-1.4.4.2/debian/git-daemon/log/run @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +LOG=/var/log/git-daemon + +test -d "$LOG" || mkdir -p -m2750 "$LOG" && chown gitlog:adm "$LOG" +exec chpst -ugitlog svlogd -tt "$LOG" --- git-core-1.4.4.2.orig/debian/git-daemon/run +++ git-core-1.4.4.2/debian/git-daemon/run @@ -0,0 +1,5 @@ +#!/bin/sh +exec 2>&1 +echo 'git-daemon starting.' +exec chpst -m64000000 \ + git-daemon --verbose --base-path=/var/cache /var/cache/git --- git-core-1.4.4.2.orig/debian/gitweb.examples +++ git-core-1.4.4.2/debian/gitweb.examples @@ -0,0 +1 @@ +debian/examples/index.aux-generation