--- git-core-1.6.0.4.orig/debian/gitweb.NEWS.Debian +++ git-core-1.6.0.4/debian/gitweb.NEWS.Debian @@ -0,0 +1,8 @@ +git-core (1:1.5.6.2-1) unstable; urgency=low + + The gitweb auxiliary files gitweb.css, git-favicon.png, git-logo.png + are moved from /var/www/ to /usr/share/gitweb/ to comply with the + current draft Debian webapps policy. You need to either adapt the + web server configuration, or copy/symlink them back to /var/www/. + + -- Gerrit Pape Sun, 06 Jul 2008 18:35:27 +0000 --- git-core-1.6.0.4.orig/debian/control +++ git-core-1.6.0.4/debian/control @@ -0,0 +1,189 @@ +Source: git-core +Section: devel +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Gerrit Pape +Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, libdbd-sqlite3-perl +Standards-Version: 3.8.0.1 +Vcs-Git: http://smarden.org/git/git.git/ + +Package: git-core +Architecture: any +Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl +Recommends: patch, less, rsync, ssh-client +Suggests: git-doc, git-arch, git-cvs, git-svn, git-email, git-daemon-run, git-gui, gitk, gitweb +Replaces: cogito (<< 0.16rc2-0), git-completion +Conflicts: git (<< 4.3.20-11), qgit (<< 1.5.5), git-completion +Provides: git-completion +Description: fast, scalable, distributed revision control system + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git main components with minimal dependencies. + Additional functionality, e.g. a graphical user interface and revision + tree visualizer, tools for interoperating with other VCS's, or a web + interface, is provided as separate git* packages. + +Package: git-doc +Section: doc +Architecture: all +Suggests: git-core, git-arch, git-cvs, git-svn, git-email, gitk, gitweb +Description: fast, scalable, distributed revision control system (documentation) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the documentation. + +Package: git-arch +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tla +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (arch interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides tools for importing development history from arch + repositories. + +Package: git-cvs +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), cvsps (>> 2.1-0), libdbd-sqlite3-perl +Suggests: git-doc, cvs +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (cvs interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides tools for interoperating with CVS repositories, + importing CVS development history, and providing CVS client access to + git repositories. + +Package: git-svn +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), libsvn-perl | libsvn-core-perl, libwww-perl, libterm-readkey-perl +Suggests: git-doc, subversion +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (svn interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides tools for interoperating with subversion repositories, + and importing SVN development history. + +Package: git-email +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), libnet-smtp-ssl-perl +Recommends: libemail-valid-perl, libauthen-sasl-perl +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (email add-on) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git-send-email program for sending series of + patch emails. + +Package: git-daemon-run +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), runit (>= 1.8.0-2), adduser +Description: fast, scalable, distributed revision control system (git-daemon service) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides a git-daemon service. git-daemon is a simple server + for git repositories, ideally suited for read-only updates, i.e., pulling + from git repositories through the network. + +Package: git-gui +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tk (>= 8.4) +Replaces: git-core (<< 1:1.5.2.2-3) +Recommends: gitk +Suggests: git-doc +Description: fast, scalable, distributed revision control system (GUI) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git graphical user interface. + +Package: gitk +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tk (>= 8.4) +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (revision tree visualizer) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the gitk program, a tcl/tk revision tree visualizer. + +Package: gitweb +Architecture: all +Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), perl +Suggests: git-doc +Description: fast, scalable, distributed revision control system (web interface) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides a web interface for browsing git repositories. --- git-core-1.6.0.4.orig/debian/gitweb.docs +++ git-core-1.6.0.4/debian/gitweb.docs @@ -0,0 +1 @@ +gitweb/README --- git-core-1.6.0.4.orig/debian/gitweb.README.Debian +++ git-core-1.6.0.4/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.6.0.4.orig/debian/git-daemon-run.postinst +++ git-core-1.6.0.4/debian/git-daemon-run.postinst @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +getent passwd gitlog >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitlog +getent passwd gitdaemon >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitdaemon + +test -z "$2" || dpkg --compare-versions "$2" gt '1:1.5.4.2-1' || { + update-service --remove /etc/sv/git-daemon 2>/dev/null || : + sleep 6 + set "$1" +} + +# enable git-daemon service +update-service --add /etc/sv/git-daemon + +# restart git-daemon service if it was running +test -z "$2" || sv -v term git-daemon || : --- git-core-1.6.0.4.orig/debian/git-doc.docs +++ git-core-1.6.0.4/debian/git-doc.docs @@ -0,0 +1,3 @@ +tmp/html/* +Documentation/technical +RelNotes --- git-core-1.6.0.4.orig/debian/git-core.preinst +++ git-core-1.6.0.4/debian/git-core.preinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e + +test -z "$2" || dpkg --compare-versions "$2" gt '1:1.5.2~rc3-2' || + exec update-alternatives --remove git /usr/bin/git-scm --- git-core-1.6.0.4.orig/debian/git-daemon-run.postrm +++ git-core-1.6.0.4/debian/git-daemon-run.postrm @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +sv force-stop git-daemon || : +rm -rf /etc/sv/git-daemon/supervise /etc/sv/git-daemon/log/supervise +rm -rf /var/lib/supervise/git-daemon /var/lib/supervise/git-daemon.log + +for i in '@*' current config lock state; do + rm -f /var/log/git-daemon/$i +done +rmdir /var/log/git-daemon || : + +getent passwd gitlog >/dev/null || exit 0 +! deluser --version >/dev/null 2>&1 || exec deluser gitlog +echo 'deluser program not available, not removing system user "gitlog".' >&2 --- git-core-1.6.0.4.orig/debian/rules +++ git-core-1.6.0.4/debian/rules @@ -0,0 +1,236 @@ +#!/usr/bin/make -f + +ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) + +CC =gcc +CFLAGS =-g -Wall +STRIP =strip +TEST =test +OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \ + mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 \ + PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish \ + THREADED_DELTA_SEARCH=1 + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: strip +endif +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS +=-O0 +else +# workaround #427907 +ifeq (hppa,$(ARCH)) + CFLAGS +=-O0 +else + CFLAGS +=-O2 +endif +endif +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + TEST = +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 -1 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 build-indep-stamp + -gcc -v + DESTDIR='$(GIT)'-core $(MAKE) all \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) + test -z '$(TEST)' || \ + DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) || \ + GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) + touch build-arch-stamp +build-indep-stamp: + $(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease DOCBOOK_XSL_172=Yes + touch build-indep-stamp + +clean: deb-checkdir deb-checkuid + $(MAKE) clean $(OPTS) + ! test -e patch-stamp || \ + for i in `ls -1r 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)'-gui \ + '$(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 + chmod 644 '$(GIT)'-core/usr/share/perl5/Git.pm + # don't include arch, cvs, svn, email, gui tools, and gitk program + for i in git-archimport git-cvs git-svn git-send-email \ + git-gui git-citool; do \ + rm -f '$(GIT)'-core/usr/lib/git-core/$$i*; \ + done + rm -f '$(GIT)'-core/usr/bin/git-cvsserver + rm -f '$(GIT)'-core/usr/bin/gitk + for i in '$(GIT)'-core/usr/bin/* '$(GIT)'-core/usr/lib/git-core/*; do \ + test "`head -c2 $$i`" = '#!' || $(STRIP) -R .comment -R .note $$i; \ + done + # don't include git-gui's lib + rm -rf '$(GIT)'-core/usr/share/git-gui/ + # don't include gitk's lib + rm -rf '$(GIT)'-core/usr/share/gitk/ + # don't include arch, cvs, svn, email, gui, and gitk man pages + for i in git-archimport git-cvs git-svn git-send-email gitk \ + git-gui git-citool; 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]* + # emacs + install -m0644 -D debian/git-core.emacsen-startup \ + '$(GIT)'-core/etc/emacs/site-start.d/50git-core.el + # bash completion + install -d -m0755 '$(GIT)'-core/etc/bash_completion.d + install -m0644 contrib/completion/git-completion.bash \ + '$(GIT)'-core/etc/bash_completion.d/git + # contrib + install -d -m0755 '$(GIT)'-core/usr/share/doc/git-core + cp -R contrib '$(GIT)'-core/usr/share/doc/git-core/ + rm -rf '$(GIT)'-core/usr/share/doc/git-core/contrib/completion + find '$(GIT)'-core/usr/share/doc/git-core/contrib -type f | \ + xargs chmod 0644 + find '$(GIT)'-core/usr/share/doc/git-core/contrib -type d | \ + xargs chmod 0755 + find '$(GIT)'-core/usr/share/doc/git-core/ -name .gitignore | \ + xargs rm -f + # 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/lib/git-core && \ + install -m0755 '$(TMP)'/usr/lib/git-core/git-$$i* \ + '$(GIT)'-$$i/usr/lib/git-core/ && \ + 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-cvs + install -d -m0755 '$(GIT)'-cvs/usr/bin + install -m0755 '$(TMP)'/usr/bin/git-cvsserver '$(GIT)'-cvs/usr/bin/ + # git-arch + rm -rf '$(GIT)'-arch + install -d -m0755 '$(GIT)'-arch/usr/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-archimport \ + '$(GIT)'-arch/usr/lib/git-core/ + 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/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-send-email \ + '$(GIT)'-email/usr/lib/git-core/ + 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 + install -d -m0755 '$(GIT)'-daemon-run/etc/init.d + ln -s /usr/bin/sv '$(GIT)'-daemon-run/etc/init.d/git-daemon + # git-gui + rm -rf '$(GIT)'-gui + install -d -m0755 '$(GIT)'-gui/usr/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-gui \ + '$(GIT)'-gui/usr/lib/git-core/ + install -m0755 '$(TMP)'/usr/lib/git-core/git-citool \ + '$(GIT)'-gui/usr/lib/git-core/ + install -d -m0755 '$(GIT)'-gui/usr/share/man/man1 + for i in gui citool; do \ + install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \ + '$(GIT)'-gui/usr/share/man/man1/; \ + done + gzip -9 '$(GIT)'-gui/usr/share/man/man1/*.1 + install -d -m0755 '$(GIT)'-gui/usr/share/git-gui + cp -a '$(TMP)'/usr/share/git-gui/lib '$(GIT)'-gui/usr/share/git-gui/ + # 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 + install -d -m0755 '$(GIT)'k/usr/share/gitk + cp -a '$(TMP)'/usr/share/gitk/lib '$(GIT)'k/usr/share/gitk/ + # 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/usr/share/gitweb + install -m0644 gitweb/gitweb.css '$(GIT)'web/usr/share/gitweb/gitweb.css + install -m0644 gitweb/git-favicon.png \ + '$(GIT)'web/usr/share/gitweb/git-favicon.png + install -m0644 gitweb/git-logo.png '$(GIT)'web/usr/share/gitweb/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/* '$(GIT)'-core/usr/lib/git-core/* + 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 git-gui.deb gitk.deb gitweb.deb + rm -f debian/substvars + for i in -doc -arch -cvs -svn -daemon-run -email -gui 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.6.0.4.orig/debian/git-daemon-run.conffiles +++ git-core-1.6.0.4/debian/git-daemon-run.conffiles @@ -0,0 +1,2 @@ +/etc/sv/git-daemon/run +/etc/sv/git-daemon/log/run --- git-core-1.6.0.4.orig/debian/gitweb.conf +++ git-core-1.6.0.4/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.6.0.4.orig/debian/implicit +++ git-core-1.6.0.4/debian/implicit @@ -0,0 +1,93 @@ +# $Id: a09db2e42c8b6a2d820754d741558e5894944746 $ + +.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: install + @test -d debian/$* || sh -cx '! : directory debian/$* missing' + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb-docs-base: install + : 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: %.deb-docs-base + @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: %.deb-docs-docs + @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: install + @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: %.deb-DEBIAN-base + @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: %.deb-DEBIAN-base %.deb-docs + : 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.6.0.4.orig/debian/gitweb.conffiles +++ git-core-1.6.0.4/debian/gitweb.conffiles @@ -0,0 +1 @@ +/etc/gitweb.conf --- git-core-1.6.0.4.orig/debian/versions.upstream +++ git-core-1.6.0.4/debian/versions.upstream @@ -0,0 +1,157 @@ +v1.0.0 +v1.0.0a +v1.0.0b +v1.0.3 +v1.0.4 +v1.0.5 +v1.0.6 +v1.0.7 +v1.0.8 +v1.0.9 +v1.0.10 +v1.0.11 +v1.0.12 +v1.1.0 +v1.1.1 +v1.1.2 +v1.1.3 +v1.1.4 +v1.1.5 +v1.1.6 +v1.2.0 +v1.2.1 +v1.2.2 +v1.2.3 +v1.2.4 +v1.2.5 +v1.2.6 +v1.3.0-rc1 +v1.3.0-rc2 +v1.3.0-rc3 +v1.3.0-rc4 +v1.3.0 +v1.3.1 +v1.3.2 +v1.3.3 +v1.4.0-rc1 +v1.4.0-rc2 +v1.4.0 +v1.4.1-rc1 +v1.4.1-rc2 +v1.4.1 +v1.4.1.1 +v1.4.2-rc1 +v1.4.2-rc2 +v1.4.2-rc3 +v1.4.2-rc4 +v1.4.2 +v1.4.2.1 +v1.4.2.2 +v1.4.2.3 +v1.4.2.4 +v1.4.3-rc1 +v1.4.3-rc2 +v1.4.3-rc3 +v1.4.3 +v1.4.3.1 +v1.4.3.2 +v1.4.3.3 +v1.4.3.4 +v1.4.3.5 +v1.4.4-rc1 +v1.4.4-rc2 +v1.4.4 +v1.4.4.1 +v1.4.4.2 +v1.4.4.3 +v1.4.4.4 +v1.5.0-rc0 +v1.5.0-rc1 +v1.5.0-rc2 +v1.5.0-rc3 +v1.5.0-rc4 +v1.5.0 +v1.5.0.1 +v1.5.0.2 +v1.5.0.3 +v1.5.0.4 +v1.5.0.5 +v1.5.0.6 +v1.5.0.7 +v1.5.1-rc1 +v1.5.1-rc2 +v1.5.1-rc3 +v1.5.1 +v1.5.1.1 +v1.5.1.2 +v1.5.1.3 +v1.5.1.4 +v1.5.1.5 +v1.5.1.6 +v1.5.2-rc0 +v1.5.2-rc1 +v1.5.2-rc2 +v1.5.2-rc3 +v1.5.2 +v1.5.2.1 +v1.5.2.2 +v1.5.2.3 +v1.5.2.4 +v1.5.2.5 +v1.5.3-rc0 +v1.5.3-rc1 +v1.5.3-rc2 +v1.5.3-rc3 +v1.5.3-rc4 +v1.5.3-rc5 +v1.5.3-rc6 +v1.5.3-rc7 +v1.5.3 +v1.5.3.1 +v1.5.3.2 +v1.5.3.3 +v1.5.3.4 +v1.5.3.5 +v1.5.3.6 +v1.5.3.7 +v1.5.3.8 +v1.5.4-rc0 +v1.5.4-rc1 +v1.5.4-rc2 +v1.5.4-rc3 +v1.5.4-rc4 +v1.5.4-rc5 +v1.5.4 +v1.5.4.1 +v1.5.4.2 +v1.5.4.3 +v1.5.4.4 +v1.5.4.5 +v1.5.5-rc0 +v1.5.5-rc1 +v1.5.5-rc2 +v1.5.5-rc3 +v1.5.5 +v1.5.5.1 +v1.5.5.2 +v1.5.5.3 +v1.5.5.4 +v1.5.6-rc0 +v1.5.6-rc1 +v1.5.6-rc2 +v1.5.6-rc3 +v1.5.6 +v1.5.6.1 +v1.5.6.2 +v1.5.6.3 +v1.5.6.4 +v1.5.6.5 +v1.6.0-rc0 +v1.6.0-rc1 +v1.6.0-rc2 +v1.6.0-rc3 +v1.6.0 +v1.6.0.1 +v1.6.0.2 +v1.6.0.3 +v1.6.0.4 --- git-core-1.6.0.4.orig/debian/git-daemon-run.README.Debian +++ git-core-1.6.0.4/debian/git-daemon-run.README.Debian @@ -0,0 +1,24 @@ +git-daemon-run for Debian +------------------------- + +This package enables a git-daemon service. This allows people to use a +git:// URL to access your repositories. + +After installing this package, wait five seconds for the git-daemon +service to be picked up by runit, and check its status and logs: + + sv stat git-daemon (or alternatively: /etc/init.d/git-daemon status) + 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 that directory, 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 + +This makes 'git-clone git://git.example.org/git/foo' to clone the foo +repository on remote machines work. + + -- Gerrit Pape Sun, 03 Jun 2007 09:51:53 +0000 --- git-core-1.6.0.4.orig/debian/changelog +++ git-core-1.6.0.4/debian/changelog @@ -0,0 +1,1570 @@ +git-core (1:1.6.0.4-1ubuntu2) jaunty; urgency=low + + * SECURITY UPDATE: arbitrary command execution via diff.external configuration + variable. + - debian/diff/0005-CVE-2008-5916.diff: remove unused legacy-style URI code + in gitweb/gitweb.perl. + - CVE-2008-5916 + + -- Marc Deslauriers Fri, 20 Feb 2009 13:55:31 -0500 + +git-core (1:1.6.0.4-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental, remaining changes: + - debian/control: + - Drop recently introduced cvsps build dependency; it's only necessary + or some self tests, but is in universe (Ubuntu specific). + - Added libauthen-sasl-perl on Recommends and libnet-smtp-ssl-perl on + Depends for git-email (debian bug 505636). + + -- Kees Cook Thu, 13 Nov 2008 15:11:17 -0800 + +git-core (1:1.6.0.4-1) experimental; urgency=low + + * new upstream point release. + * debian/control: git-email: minor update to the long description + (thx Gerfried Fuchs, closes: #501559). + * debian/rules: TCLTK_PATH=/usr/bin/wish instead of wish8.5 in OPTS. + * debian/control: git-gui, gitk: Depends: tk (>= 8.4) instead of + tk8.5 (thx Adeodato Simó, closes: #503113). + * debian/rules: move the /usr/bin/git-cvsserver program into the + git-cvs package. + + -- Gerrit Pape Tue, 11 Nov 2008 22:36:05 +0000 + +git-core (1:1.6.0.3-1) experimental; urgency=low + + * debian/control: minor update to long descriptions (thx Reuben + Thomas, closes: #499065). + * debian/git-core.emacsen-startup: new; emacsen-startup configuration + file (thx Jari Aalto, closes: #472197). + * debian/rules: install emacsen-startup configuration file into the + git-core package (thx Eddy Mulyono, closes: #446027). + * new upstream point release. + * debian/git-core.conffiles: add /etc/emacs/site-start.d/50git-core.el + + -- Gerrit Pape Tue, 04 Nov 2008 20:26:56 +0000 + +git-core (1:1.6.0.2-1) experimental; urgency=low + + * new upstream point release. + * debian/git-core.NEWS.Debian: new; mention that most of the programs + now are installed outside the default $PATH; the "git-xyzzy" form + in scripts and on the command line is no longer supported in 1.6.0. + * debian/git-core.README.Debian: fix paths in config example (thx + Michael Biebl for the patch, closes: #498741). + * debian/git-core.README.Debian: typo (thx Vincent Bernat for the + patch, closes: #496834). + + -- Gerrit Pape Wed, 24 Sep 2008 20:55:26 +0000 + +git-core (1:1.6.0.1-1) experimental; urgency=low + + * new upstream point release (closes: #496155). + * merge branch debian-sid. + + -- Gerrit Pape Wed, 27 Aug 2008 07:53:36 +0000 + +git-core (1:1.6.0-1) experimental; urgency=low + + * new upstream release. + * svnimport: newer libsvn wants us to ask for the root with "", + not "/" (closes: #492522, #490400). + * Keep some git-* programs in $(bindir); Move all dashed-form + commands to libexecdir (closes: #461212). + * bash: Add more option completions for 'git log' (closes: + #490220). + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (closes: #494097). + * 0002-bug-438793-git-sh-setup.sh-builtin-tag.c-fallback.diff: redo + as 0002-bug-438793-494505-fallback-to-editor-not-vi.diff (thx + Jonathan Nieder for the patch, closes: #494505). + * debian/rules: add gitexecdir=/usr/lib/git-core to OPTS; adapt + several paths (thx Jonathan Nieder for a patch, closes: #480396). + * debian/gitweb.NEWS.Debian: new; talk about files moved from + /var/www/ to /usr/share/gitweb/ (see #479479; closes: #494467). + * debian/git-daemon/run: run git daemon instead of git-daemon + (dash-less form). + * debian/git-daemon-run.postinst: add gitdaemon system user. + * debian/git-daemon/run: utilize chpst to run git daemon as user + gitdaemon (thx Daniel Kahn Gillmor, closes: #494991). + + -- Gerrit Pape Sun, 24 Aug 2008 22:31:44 +0000 + +git-core (1:1.5.6.5-1) unstable; urgency=high + + * new upstream point release. + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (CVE-2008-3546; + closes: #494097). + * debian/diff/0005-bug-494097-CVE-2008-3546.diff: remove; obsolete. + + -- Gerrit Pape Sun, 24 Aug 2008 19:22:02 +0000 + +git-core (1:1.5.6.3-1.1ubuntu2) intrepid; urgency=low + + * debian/control: + + Added libauthen-sasl-perl on Recommends for git-email (LP: #258142). + + Added libnet-smtp-ssl-perl on Depends for git-email (LP: #272939). + + -- Alessio Treglia Wed, 24 Sep 2008 10:36:22 +0200 + +git-core (1:1.5.6.3-1.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Drop recently introduced cvsps build dependency; it's + only necessary for some self tests, but is in universe. + + -- Kees Cook Wed, 20 Aug 2008 11:52:02 -0700 + +git-core (1:1.5.6.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix various stack-based buffer overflows when processing overly long + repository pathnames which can be exploited to execute arbitrary code if + a victim is tricked into using git-grep or git-diff on a crafted + repository (CVE-2008-3546; Closes: #494097). + + -- Nico Golde Sat, 09 Aug 2008 13:53:13 +0200 + +git-core (1:1.5.6.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + remove; applied upstream (opens: #490400). + * debian/control: Standards-Version: 3.8.0.1. + + -- Gerrit Pape Thu, 17 Jul 2008 07:40:08 +0000 + +git-core (1:1.5.6.2-1) unstable; urgency=low + + * new upstream point release (closes: #489431). + * debian/copyright: apply patch from Ansgar Burchardt: adopt proposed + machine-readable format; clarify some license information (thx, + closes: #488351). + * debian/rules: package gitweb: install gitweb.css, git-favicon.png, + git-logo.png into /usr/share/gitweb/ instead of /var/www/ (closes: + #479479). + * debian/control: package git-arch: no longer Suggests: bazaar + (closes: #486726). + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + new; git-svn.perl: workaround assertions in svn library 1.5.0 + (closes: #489108). + + -- Gerrit Pape Sun, 06 Jul 2008 18:35:27 +0000 + +git-core (1:1.5.6-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Thu, 19 Jun 2008 07:38:31 +0000 + +git-core (1:1.5.6~rc3-1) experimental; urgency=low + + * debian/git-daemon-run.postrm: remove log files on purge. + * new upstream release candidate. + * debian/control: package git-core: no longer Depends: cpio, no + longer Recommends: curl. + + -- Gerrit Pape Sun, 15 Jun 2008 11:14:49 +0000 + +git-core (1:1.5.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + * debian/rules: do not build manpages twice (thx Jonathan Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 12:02:43 +0000 + +git-core (1:1.5.5.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: enable DOCBOOK_XSL_172 build variable, fixing man page + breakage (thx Jonathan Nieder, closes: #476634). + * debian/control: Build-Depends: docbook-xsl (>> 1.72) (thx Jonathan + Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 11:51:19 +0000 + +git-core (1:1.5.6~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-svn fails in prop_walk if $self->{path} is not empty (closes: + 477393). + * gitweb: Fix "next" link on bottom of page (closes: #481902). + * merge branch debian-sid. + * debian/rules: add THREADED_DELTA_SEARCH=1 to OPTS (closes: #483534). + + -- Gerrit Pape Thu, 05 Jun 2008 10:14:14 +0000 + +git-core (1:1.5.5.3-1) unstable; urgency=low + + * new upstream point release. + * commit --interactive: properly update the index before commiting + (closes: #480429). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + * debian/diff/0005-bug-477337-git-svn.perl-fallback-to-pager...diff: + new; git-svn.perl: fallback to 'pager' not 'less' if PAGER is unset + (closes: #477337). + + -- Gerrit Pape Wed, 28 May 2008 19:32:57 +0000 + +git-core (1:1.5.6~rc0-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file...diff: + remove; fixed upstream. + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + + -- Gerrit Pape Mon, 26 May 2008 16:53:38 +0000 + +git-core (1:1.5.5.2-1) unstable; urgency=low + + * new upstream point release. + * diff-options.txt: document the new "--dirstat" option (closes: + #476437). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + new: git-bisect.sh: don't accidentally override existing branch + "bisect" (closes: #478647). + + -- Gerrit Pape Mon, 26 May 2008 16:41:45 +0000 + +git-core (1:1.5.5.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 21 Apr 2008 18:24:34 +0000 + +git-core (1:1.5.5-1) unstable; urgency=low + + * new upstream release. + * gitk: Fix changing colors through Edit->Preferences (closes: #472615). + * Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output" + (closes: #469083). + * merge branch debian/experimental. + + -- Gerrit Pape Tue, 08 Apr 2008 20:26:25 +0000 + +git-core (1:1.5.5~rc3-2) experimental; urgency=low + + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + amend: properly apply GITWEB_CONFIG_SYSTEM to gitweb.cgi. + + -- Gerrit Pape Fri, 04 Apr 2008 20:40:48 +0000 + +git-core (1:1.5.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + new: gitweb: fallback to system-wide config file if default config does + not exist (closes: #450592). + * debian/rules: remove GITWEB_CONFIG=/etc/gitweb.conf from OPTS. + + -- Gerrit Pape Thu, 03 Apr 2008 19:43:33 +0000 + +git-core (1:1.5.5~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * t9600-cvsimport.sh: set HOME before checking for cvsps availability + (closes: #471969). + * imap-send: properly error out if imap.host is not set in config + (closes: #472632). + * merge branch debian-sid. + + -- Gerrit Pape Fri, 28 Mar 2008 08:53:30 +0000 + +git-core (1:1.5.4.5-1) unstable; urgency=low + + * new upstream point release (closes: #473071). + + -- Gerrit Pape Fri, 28 Mar 2008 08:26:39 +0000 + +git-core (1:1.5.5~rc1-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sun, 23 Mar 2008 11:55:21 +0000 + +git-core (1:1.5.5~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * git-pull documentation: warn about the option order (closes: #463853). + * hash-object: cleanup handling of command line options (closes: + #464432). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 19 Mar 2008 07:45:01 +0000 + +git-core (1:1.5.4.4-1) unstable; urgency=low + + * new upstream point release. + * templates/Makefile: don't depend on local umask setting (closes: + #467518). + * Fix random crashes in http_cleanup() (closes: #468836). + * send-email: fix In-Reply-To regression (closes: #468153). + * git-merge.sh: better handling of combined --squash,--no-ff,--no-commit + options (closes: #468568). + + -- Gerrit Pape Mon, 10 Mar 2008 10:38:51 +0000 + +git-core (1:1.5.4.3-1ubuntu2) hardy; urgency=low + + * debian/rules: Use wish8.4 for the tcl interpreter, to match our dependency + in debian/control. (LP: #196846) + + -- Bryan Donlan Sun, 06 Apr 2008 18:53:53 -0400 + +git-core (1:1.5.4.3-1ubuntu1) hardy; urgency=low + + * debian/control: Switch back Tcl/Tk dependencies to 8.4, since that's what + we settled for in Hardy. + * debian/control: Drop recently introduced cvsps build dependency; it's only + necessary for some self tests, but is in universe. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Martin Pitt Wed, 27 Feb 2008 16:34:26 +0100 + +git-core (1:1.5.4.3-1) unstable; urgency=low + + * new upstream point release. + * git-clone.sh: properly configure remote even if remote's head is + dangling (closes: #466581). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + new: from upstream master: gitk: properly deal with tag names containing / + (slash) (closes: #464104). + * debian/git-daemon-run.postrm: adapt paths in /var/. + + -- Gerrit Pape Sun, 24 Feb 2008 16:19:02 +0000 + +git-core (1:1.5.4.2-2) unstable; urgency=low + + * debian/rules: git-daemon-run: no longer include symlinks for ./supervise/ + subdirectories, update-service now takes care of this. + * debian/git-daemon-run.postinst: remove ad re-add git-daemon service on + upgrade from <= 1.5.4.2-1. + + -- Gerrit Pape Mon, 18 Feb 2008 22:22:14 +0000 + +git-core (1:1.5.4.2-1) unstable; urgency=low + + * new upstream point release. + * cvsimport: have default merge regex also match beginning of commit + message (thx Frédéric Brière, closes: #463468). + * builtin-commit: remove .git/SQUASH_MSG upon successful commit (closes: + #464656). + * debian/rules: change TCLTK_PATH to /usr/bin/wish8.5 in OPTS. + * debian/control: Build-Depends: tcl8.5; git-gui, gitk: Depends: tk8.5 + (closes: #456423). + * debian/git-daemon-run.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: use runit's update-service program to + add/remove the git daemon service, instead of dealing with symlinks in + /var/service/ directly. + * debian/control: package git-daemon: Depends: runit (>= 1.8.0-2) (1st + version that provides the update-service program). + + -- Gerrit Pape Sun, 17 Feb 2008 18:48:00 +0000 + +git-core (1:1.5.4.1-1) unstable; urgency=medium + + * debian/control: Build-Depends: cvsps (for selftests, thx Marco Rodrigues, + closes: #463896). + * new upstream point release. + + -- Gerrit Pape Mon, 11 Feb 2008 12:00:03 +0000 + +git-core (1:1.5.4-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/git-core.README.Debian: add Alias'es for git-favicon.png and + git-logo.png to the VirtualHost example (thx Frederic Briere, closes: + #463732). + * debian/rules: target build-arch-stamp: re-run selftests with --verbose + on test failures. + + -- Gerrit Pape Sun, 03 Feb 2008 05:01:16 +0000 + +git-core (1:1.5.4~rc5-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 28 Jan 2008 11:01:08 +0000 + +git-core (1:1.5.4~rc4-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + adapt; don't warn if /etc/mailname does not exist (closes: #461844). + * debian/rules: install /usr/share/gitk/ into the gitk package, not + git-core. + + -- Gerrit Pape Mon, 21 Jan 2008 21:15:21 +0000 + +git-core (1:1.5.4~rc3-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * "git pull --tags": error out with a better message (closes: #456035). + * gitk: use user-configured background in view definition dialog + (closes: #457124). + * debian/control: Build-Depends: cvs, libdbd-sqlite3-perl (for selftests). + + -- Gerrit Pape Sat, 12 Jan 2008 15:09:23 +0000 + +git-core (1:1.5.3.8-1) unstable; urgency=low + + * debian/control: for all packages: Suggests: git-doc instead of + Recommends: (thx Andrew Moise, closes: #455369). + * debian/control: add Vcs-Git: http://smarden.org/git/git.git/. + * new upstream point release. + + -- Gerrit Pape Tue, 08 Jan 2008 21:01:35 +0000 + +git-core (1:1.5.4~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * shortlog manpage documentation: work around asciidoc markup issues + (closes: #447911). + * Fix $EDITOR regression introduced by rewrite in C (closes: #446845). + + -- Gerrit Pape Thu, 27 Dec 2007 08:45:01 +0000 + +git-core (1:1.5.4~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * gitweb: Teach "a=blob" action to be more lenient about blob/file mime + type (closes: #435610). + + -- Gerrit Pape Thu, 20 Dec 2007 09:07:10 +0000 + +git-core (1:1.5.4~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * build with correct version information (on amd64, closes: #454935, + #454408). + * git-reset: add -q option to operate quietly (closes: #444933). + * gitk: disable colours when calling git log (closes: #454420). + * "git svnimport" was removed in favor of "git svn" (closes: #436930, + #447325, #447965, #451037). + * git-commit: allow grouping of short options (closes: #407241). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff, + debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: remove; + applied upstream. + * debian/rules: install git-gui's lib/ directory plus subdirectory + properly. + * debian/control: Build-Depends: gettext. + + -- Gerrit Pape Thu, 13 Dec 2007 14:08:45 +0000 + +git-core (1:1.5.3.7-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: new; don't + cache DESTDIR in perl/perl.mak (#452077). + * debian/rules: remove $(MAKE) -C perl clean to remove the perl/perl.mak + again, this is now handled through debian/diff/0005 (thx Pierre + Habouzit, #452077). + + -- Gerrit Pape Mon, 3 Dec 2007 10:17:11 +0000 + +git-core (1:1.5.3.6-1.1) unstable; urgency=low + + * Non-maintainer upload: Gerrit is currently changing home, and this bug is + preventing people from installing git, I took the initiative to fix it + before his return. + * debian/rules: force a $(MAKE) -C perl clean to remove the perl/perl.mak + that remembers our DESTDIR and makes perl modules be installed in + debian/git-core/ in the install-indep target again + (closes: #452077, #452078, #452080, #452111, #452324). + + -- Pierre Habouzit Thu, 22 Nov 2007 00:40:08 +0100 + +git-core (1:1.5.3.6-1) unstable; urgency=low + + * debian/implicit: add proper dependencies to support 'parallel build' + through make -j (thx Daniel Schepler for the patch). + * debian/rules: support 'nocheck' in DEB_BUILD_OPTIONS to skip running + the selftests. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + new; check /etc/mailname if author email is unknown (closes: #448655). + * debian/gitweb.docs: new; install gitweb/README. + * new upstream point release. + * git-cvsimport: really convert underscores in branch names to dots with + -u (closes: #446495). + * git-mailsplit: with maildirs not only process cur/, but also new/ + (closes: #447396). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff: + new; cherry-pick'ed from master: contrib/hooks/post-receive-email: make + subject prefix configurable (closes: #428418). + + -- Gerrit Pape Mon, 19 Nov 2007 12:32:11 +0000 + +git-core (1:1.5.3.5-1) unstable; urgency=low + + * new upstream point release. + * git-config: handle --file option with relative pathname properly; + git-config: print error message if the config file cannot be read; + git-config: don't silently ignore options after --list (closes: + #445208). + + -- Gerrit Pape Thu, 01 Nov 2007 08:35:46 +0000 + +git-core (1:1.5.3.4-1) unstable; urgency=low + + * new upstream point release (closes: #445188). + + -- Gerrit Pape Thu, 04 Oct 2007 08:27:01 +0000 + +git-core (1:1.5.3.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Sun, 30 Sep 2007 09:25:06 +0000 + +git-core (1:1.5.3.2-1) unstable; urgency=low + + * new upstream point release. + * git-svn: fix "Malformed network data" with svn:// servers (closes: + #430091, #436142). + * git-commit: Allow partial commit of file removal (closes: #437817). + * git-gui: lib/index.tcl: handle files with % in the filename properly + (closes: #441167). + * git-clone: improve error message if curl program is missing or not + executable (closes: #440976). + * debian/git-daemon-run.postinst: use 'sv -v term git-daemon' instead of + 'sv restart git-daemon' to restart git-daemon service if it was running. + * debian/control: git-core: no longer Suggests: cogito, which was removed. + * debian/diff/genindex.diff: apply and remove. + * debian/gitweb.conf: comment out $home_link, and set to gitweb.cgi's + default (thx Ansgar Burchardt for the patch, closes: 441694). + + -- Gerrit Pape Thu, 20 Sep 2007 07:28:41 +0000 + +git-core (1:1.5.3.1-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-daemon-run: improve long description (closes: + #440699). + * debian/git-daemon-run.README.Debian: improve. + * debian/control: git-svn: improve long description. + * debian/control: git-cvs: improve long description. + * debian/control: git-core: improve long description (closes: #412560). + + -- Gerrit Pape Tue, 04 Sep 2007 18:18:33 +0000 + +git-core (1:1.5.3-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/control: git-email: move libemail-valid-perl from Depends: to + Recommends: (thx Uwe Kleine-Koenig, closes: #439902). + * debian/control: git-email: no longer Depends: libmail-sendmail-perl (thx + Uwe Kleine-Koenig). + + -- Gerrit Pape Sun, 02 Sep 2007 16:41:54 +0000 + +git-core (1:1.5.3~rc7-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + remove; included upstream. + + -- Gerrit Pape Wed, 29 Aug 2007 12:22:16 +0000 + +git-core (1:1.5.3~rc6-1) experimental; urgency=low + + * new upstream release candidate. + * git-am: initialize variable $resume on startup (closes: #435807). + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + new; http://article.gmane.org/gmane.comp.version-control.git/55981. + * debian/diff/0003-git-sh-setup.sh-fallback-to-editor-not-vi-if-VI.diff: + new; git-sh-setup.sh: fallback to 'editor' not 'vi' if $VISUAL and $EDITOR + are unset (thx Mike Hommey, closes: #438793). + * merge branch debian-sid. + + -- Gerrit Pape Sun, 26 Aug 2007 09:54:16 +0000 + +git-core (1:1.5.2.5-2) unstable; urgency=low + + * debian/git-core.conffiles: new; add /etc/bash_completion.d/git. + + -- Gerrit Pape Sun, 26 Aug 2007 09:49:39 +0000 + +git-core (1:1.5.2.5-1) unstable; urgency=low + + * debian/control: fix typo in Build-Depends: libcurl4-gnutls-dev | + libcurl3-gnutls-dev (thx Mikael Eriksson, closes: #433196). + * new upstream point release. + * debian/rules: add TCLTK_PATH=/usr/bin/wish8.4 to OPTS (closes: #438662). + * dbian/control: git-core: Depends: cpio (closes: #438057). + * debian/git-core.README.Debian: fix typos (closes: #438932). + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/rules, debian/control: install git-completion.bash from contrib as + /etc/bash_completion.d/git; git-core: Conflicts:, Provides:, Replaces: + git-completion (closes: #437532, thx Sebastian Harl). + + -- Gerrit Pape Sat, 25 Aug 2007 17:56:20 +0000 + +git-core (1:1.5.3~rc4-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sat, 04 Aug 2007 13:02:05 +0000 + +git-core (1:1.5.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 27 Jul 2007 11:13:52 +0000 + +git-core (1:1.5.3~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/????-Pack-objects-properly-initialize-the-depth-value.diff: + remove; obsolete. + * debian/control, debian/rules: remove git-p4 package again, moved into + contrib/ upstream; see /usr/share/doc/git-core/contrib/p4import/. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 20 Jul 2007 08:47:45 +0000 + +git-core (1:1.5.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-commit: don't add multiple Signed-off-by: from the same identity + (closes: #430851). + * Fix core.sharedRepository = 2 (closes: #432698). + * merge branch debian-sid. + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + remove; doesn't apply anymore. + * debian/diff/0002-Pack-objects-properly-initialize-the-depth-value.diff: + new; on upstream advice. + + -- Gerrit Pape Sat, 14 Jul 2007 11:45:27 +0000 + +git-core (1:1.5.2.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: build documentation with ASCIIDOC8=YesPlease (closes: + #432560). + * debian/control: Build-Depends: asciidoc (>> 8.0.0). + * debian/diff/????-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + remove; merged upstream. + * debian/control: Build-Depends: libcurl4-gnutls-dev | libcurl3-gnutsl-dev + (closes: #432812). + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 13 Jul 2007 19:13:38 +0000 + +git-core (1:1.5.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/changelog.upstream.sh: run git shortlog with option --no-merges. + * debian/versions.upstream, debian/changelog.upstream: update. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff, + debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + remove; applied upstream. + * debian/diff/00*.diff: adapt. + * debian/rules: put git-gui, git-citool man pages into package git-gui. + + -- Gerrit Pape Tue, 03 Jul 2007 10:01:12 +0000 + +git-core (1:1.5.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: package git-gui: Replaces: git-core (<< 1:1.5.2.2-3) + (thx Frank Lichtenheld, closes: #431481). + * debian/versions.upstream, debian/changelog.upstream: update. + + -- Gerrit Pape Tue, 03 Jul 2007 08:26:11 +0000 + +git-core (1:1.5.2.2-3) unstable; urgency=low + + * debian/rules: move /usr/share/git-gui/ from git-core package into + git-gui package (thx Ansgar Burchardt, closes: #430530). + * debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + new; git-cvsimport: force checkout of working tree after initial import + (closes: #430903). + * debian/diff/0005-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + new; git-gui: properly popup error if gitk should be started but is not + installed (#429810). + * debian/control: git-gui: Recommends: gitk (closes: #429810). + * debian/rules: workaround #427907: compile with -O0 instead of -O2 on hppa + (#429389). + + -- Gerrit Pape Fri, 29 Jun 2007 12:54:39 +0000 + +git-core (1:1.5.2.2-2) unstable; urgency=low + + * debian/control: all Architecture: all packages: Depends: git-core (>> + ${source:Upstream-Version}, git-core (<< ${source:Upstream-Version}-.) + instead of (= ${source:Version}) to support binNMUs (closes: #423041, + #430128). + + -- Gerrit Pape Sat, 23 Jun 2007 14:02:36 +0000 + +git-core (1:1.5.2.2-1) unstable; urgency=low + + * new upstream point release. + * Fix typo in remote branch example in git user manual (closes: #427502). + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + remove; applied upstream. + * debian/versions.upstream: new; ordered list of upstream versions, + starting with 1.0.0. + * debian/changelog.upstream.sh: new; create changelog.upstream from git + shortlog using debian/versions.upstream. + * debian/changelog.upstream: re-created through changelog.upstream.sh. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff: + new; git-svn: trailing slash in prefix is mandatory with --branches/-b + (closes: #429443). + + -- Gerrit Pape Tue, 19 Jun 2007 17:32:30 +0000 + +git-core (1:1.5.2.1-2) unstable; urgency=low + + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + new; from upstream master: git-branch --track: fix tracking branch + computation. + + -- Gerrit Pape Fri, 8 Jun 2007 09:04:47 +0000 + +git-core (1:1.5.2.1-1) unstable; urgency=low + + * new upstream point release. + * Create a new manpage for the gitignore format, and reference it + elsewhere (thx Josh Triplett, closes: #427078). + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + new; properly resolve ambiguity if argument is both, revision and + filename (closes: #425491). + * debian/control: git-core: Conflicts: git (<< 4.3.20-11) (/usr/bin/git + transition). + * debian/git-daemon-run.README.Debian: new (#422139). + * debian/control: all Architecture: all packages: Depends: git-core + (= ${source:Version}) instead of (>= ...); this makes it no longer + support binNMUs (closes: #425494, reopens: #423041). + + -- Gerrit Pape Sun, 03 Jun 2007 10:09:53 +0000 + +git-core (1:1.5.2-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * gitweb: choose appropriate view for file type if a= parameter missing + (closes: #410465). + * git fetch -q is supported (closes: #423165). + * /usr/bin/git transition (thx Ian Beckwith!). + * debian/git-core.preinst: new; remove /usr/bin/git alternative if + upgrading from versions older than 1:1.5.2~rc3-2. + * debian/git-core.prerm, debian/git-core.postinst: remove; no longer + handle /usr/bin/git alternative through update-alternatives. + * debian/rules: no longer install git program as git-scm. + + -- Gerrit Pape Wed, 30 May 2007 12:38:45 +0000 + +git-core (1:1.5.2~rc3-2) experimental; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: remove; obsolete. + * debian/control: package git-p4: Section: contrib/devel (closes: + #422755). + * debian/control: package git-p4: Depends: git-core (>= ${source:Version}) + instead of (= ${Source-Version}) (to support binNMUs). + + -- Gerrit Pape Tue, 15 May 2007 21:33:06 +0000 + +git-core (1:1.5.1.4-2) unstable; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: new; snapshot upstream + maint branch 20070514: + * includes git-svn fixes (closes: #423599, #423226). + * deian/rules: reverse order when applying diffs (fix typo). + * debian/control: all Architecture: all packages: Depends: git-core (>= + ${source:Version}) instead of (= ${Source-Version}) (to support binNMUs, + closes: #423041). + + -- Gerrit Pape Mon, 14 May 2007 13:15:50 +0000 + +git-core (1:1.5.2~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + remove; included upstream. + * debian/control: Build-Depends: tcl8.4 (for gitgui). + * debian/rules: add symlink /etc/init.d/git-daemon -> /usr/bin/sv to + git-daemon-run package (#422139). + + -- Gerrit Pape Mon, 14 May 2007 10:10:02 +0000 + +git-core (1:1.5.1.4-1) unstable; urgency=medium + + * new upstream point release. + * debian/diff/pager-vs-less.diff: rename to + 0001-pager.c-fallback-to-pager-not-less-if-PAGER-is.diff; adapt. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + new: Optimize directory listing with pathspec limiter (closes: #420671). + * debian/git-daemon-run.postinst: restart git-daemon service if it was + running. + + -- Gerrit Pape Wed, 09 May 2007 08:48:50 +0000 + +git-core (1:1.5.2~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 07 May 2007 18:02:53 +0000 + +git-core (1:1.5.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/control, debian/rules: new package git-p4: tools for importing + development history from perforce repositories. + * debian/rules: add WITH_P4IMPORT=1 to OPTS; no longer install + git-p4import.py into /usr/share/doc/git-core/contrib/; add OPTS to + make clean in target clean:; add PYTHON_PATH=/usr/bin/python to OPTS. + + -- Gerrit Pape Tue, 01 May 2007 12:28:15 +0000 + +git-core (1:1.5.1.3-1) unstable; urgency=low + + * new upstream point release. + * git-add tried to optimize by finding common leading directories + across its arguments but botched, causing very confused behaviour + (closes: #420671). + * Documentation/git-reset.txt: suggest git commit --amend in example + (closes: #420112). + * unofficial rpm.spec file shipped with git was letting ETC_GITCONFIG + set to /usr/etc/gitconfig. Tweak the official Makefile to make it + harder for distro people to make the same mistake, by setting the + variable to /etc/gitconfig if prefix is set to /usr (closes: + #420675). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 01 May 2007 08:59:06 +0000 + +git-core (1:1.5.1.2-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Sun, 22 Apr 2007 13:31:05 +0000 + +git-core (1:1.5.1.1-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + remove; applied upstream. + + -- Gerrit Pape Thu, 12 Apr 2007 09:05:44 +0000 + +git-core (1:1.5.1-1) unstable; urgency=low + + * new upstream release. + * git-svn got almost a rewrite (closes: #416372). + * debian/diff/git-cvsserver-update-hook.diff: remove; included upstream. + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff, + debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff, + debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + remove; applied upstream. + * debian/diff/GNU-Hurd.diff: remove; obsolete. + * debian/git-daemon-run.postrm: check for deluser being available, if + not, print warning and don't remove system user (closes: #416755). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement, and git shortlog. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + new; rename contrib/hooks/post-receieve-email to contrib/hooks/post- + receive-email. + + -- Gerrit Pape Wed, 4 Apr 2007 11:56:18 +0000 + +git-core (1:1.5.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff: + new, cherry-pick'ed from upstream master: http-fetch: don't use + double-slash as directory separator in URLs (closes: #409887). + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff: new: + Documentation/git-svnimport.txt: fix typo. + * debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + new Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES + (closes: #404795). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Thu, 29 Mar 2007 10:51:00 +0000 + +git-core (1:1.5.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: make sure subdirectories of /usr/share/doc/git-core/ are + mode 0755 (closes: #415328); remove .gitignore file(s) from + /usr/share/doc/git-core/ (closes: #413913). + * debian/control: git-svn: Depends: libterm-readkey-perl (thx Pierre + Habouzit, closes: #415475). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Wed, 21 Mar 2007 17:02:27 +0000 + +git-core (1:1.5.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/cvsexportcommit-.msg.diff: remove; applied upstream. + * debian/git-core.docs, debian/git-doc.docs: add RelNotes. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 5 Mar 2007 19:44:05 +0000 + +git-core (1:1.5.0.2-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-core: Conflicts: qgit (<< 1.5.5) (closes: #412452). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/cvsexportcommit-.msg.diff: new; don't cleanup .msg if not + yet committed to cvs (closes: #412732). + + -- Gerrit Pape Wed, 28 Feb 2007 15:50:53 +0000 + +git-core (1:1.5.0.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/git-cvsserver-update-hook.diff: new from upstream pu branch: + Have git-cvsserver call hooks/update before really altering the ref. + * debian/control: git-cvs: Depends: libdbd-sqlite3-perl (git-cvsserver). + + -- Gerrit Pape Sun, 25 Feb 2007 11:38:34 +0000 + +git-core (1:1.5.0-1) experimental; urgency=low + + * new upstream release. + * debian/diff/archimport-empty-dir.diff: remove; applied upstream. + * debian/diff/pager-vs-less.diff, debian/diff/Add-install-lib-target.diff: + adapt. + * debian/control: new package git-gui, the git graphical user interface; + git-core: no longer Depends:, Build-Depends: rcs; git-core: Suggests: + git-gui. + * debian/rules: new package git-gui. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git shortlog. + * debian/git-daemon/run: don't limit git-daemon's memory resources. + * debian/control, debian/rules: remove git-core-dev package again, + libgit.a is not a publically usable/useful library at this moment, as + its internal API is not cast in stone yet. + * debian/diff/Add-install-lib-target.diff: remove; there's no git-core-dev + package. + + -- Gerrit Pape Fri, 16 Feb 2007 07:18:44 +0000 + +git-core (1:1.5.0~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/Add-install-lib-target.diff: new; add install-lib target to + install libgit.a library plus header files (thx Luca Falavigna). + * debian/rules: new package git-core-dev; remove obsolete + WITH_SEND_EMAIL=1, OPTIMIZE="..." from $(OPTS); remove + WITH_OWN_SUBPROCESS_PY=1 from $(OPTS), it's no longer necessary (thx + Luca Falavigna; closes: #403731); make git-p4import.pl available through + /usr/share/doc/git-core/contrib/ (closes: #403387); minor cleanup. + * debian/control: new package git-core-dev (thx Luca Falavigna; closes: + #407722); no longer Build-Depends: python; git-core: no longer Recommends: + python, Suggests: git-core-dev; update short and long descriptions + (closes: #406323); git-arch: Depends: tla, instead of Suggests:. + * debian/diff/GNU-Hurd.diff: adapt. + * debian/diff/archimport-empty-dir.diff: new; git-archimport: initial import + needs empty directory (closes: #400508). + * debian/gitweb.README.Debian: typo. + + -- Gerrit Pape Sat, 3 Feb 2007 09:32:48 +0000 + +git-core (1:1.4.4.4-1) unstable; urgency=low + + * new upstream release, important fixes: + * pack-check.c::verify_packfile(): don't run SHA-1 update on huge data. + * Fix infinite loop when deleting multiple packed refs. + * diff --check: fix off by one error. + * debian/diff/0001-spurious-.sp-in-manpages.diff: remove; included in + upstream version. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 9 Jan 2007 19:43:56 +0000 + +git-core (1:1.4.4.3-1) unstable; urgency=medium + + * new upstream release (closes: #404796); important fixes: + * Make sure the empty tree exists when needed in merge-recursive; the + error message may make the user think that their database is corrupt + when its actually not. + * Don't use memcpy when source and dest. buffers may overlap. + * cvsserver: Avoid miscounting bytes in Perl v5.8.x; this breaks the + counting of bytes for the CVS protocol, resulting in the client + expecting less data than we actually send, and storing truncated files. + * debian/diff/0001-spurious-.sp-in-manpages.diff: new from upstream git; + work around spurious .sp in manpages (closes: #388370). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Fri, 29 Dec 2006 07:38:15 +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.6.0.4.orig/debian/gitweb.examples +++ git-core-1.6.0.4/debian/gitweb.examples @@ -0,0 +1 @@ +debian/examples/index.aux-generation --- git-core-1.6.0.4.orig/debian/git-core.emacsen-startup +++ git-core-1.6.0.4/debian/git-core.emacsen-startup @@ -0,0 +1,165 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50git-core.el +;; for the Debian git-core package + +(if (and (not (featurep 'xemacs)) + (string< emacs-version "23")) + ;; Do not load or activate these under Emacs 23.x which already + ;; contains git support + (progn + ;; From http://www.emacswiki.org/cgi-bin/wiki/Git + (add-to-list + 'load-path + "/usr/share/doc/git-core/contrib/emacs" + 'append) + + (autoload 'vc-git--run-command-string "vc-git" "" nil) + (autoload 'vc-git--run-command "vc-git" "" nil) + (autoload 'vc-git-registered "vc-git" "" nil) + (autoload 'vc-git-state "vc-git" "" nil) + (autoload 'vc-git-workfile-version "vc-git" "" nil) + (autoload 'vc-git-symbolic-commit "vc-git" "" nil) + (autoload 'vc-git-previous-version "vc-git" "" nil) + (autoload 'vc-git-next-version "vc-git" "" nil) + (autoload 'vc-git-revert "vc-git" "" nil) + (autoload 'vc-git-checkout-model "vc-git" "" nil) + (autoload 'vc-git-workfile-unchanged-p "vc-git" "" nil) + (autoload 'vc-git-register "vc-git" "" nil) + (autoload 'vc-git-print-log "vc-git" "" nil) + (autoload 'vc-git-diff "vc-git" "" nil) + (autoload 'vc-git-checkin "vc-git" "" nil) + (autoload 'vc-git-checkout "vc-git" "" nil) + (autoload 'vc-git-annotate-command "vc-git" "" nil) + (autoload 'vc-git-annotate-time "vc-git" "" nil) + + (add-to-list 'vc-handled-backends 'git) + + (autoload 'git-get-env-strings "git" "" nil) + (autoload 'git-call-process-env "git" "" nil) + (autoload 'git-call-process-display-error "git" "" nil) + (autoload 'git-call-process-env-string "git" "" nil) + (autoload 'git-run-process-region "git" "" nil) + (autoload 'git-run-command-buffer "git" "" nil) + (autoload 'git-run-command-region "git" "" nil) + (autoload 'git-run-hook "git" "" nil) + (autoload 'git-get-string-sha1 "git" "" nil) + (autoload 'git-get-committer-name "git" "" nil) + (autoload 'git-get-committer-email "git" "" nil) + (autoload 'git-get-commits-coding-system "git" "" nil) + (autoload 'git-get-logoutput-coding-system "git" "" nil) + (autoload 'git-escape-file-name "git" "" nil) + (autoload 'git-success-message "git" "" nil) + (autoload 'git-get-top-dir "git" "" nil) + (autoload 'git-append-to-ignore "git" "" nil) + (autoload 'git-rev-parse "git" "" nil) + (autoload 'git-config "git" "" nil) + (autoload 'git-symbolic-ref "git" "" nil) + (autoload 'git-update-ref "git" "" nil) + (autoload 'git-read-tree "git" "" nil) + (autoload 'git-write-tree "git" "" nil) + (autoload 'git-commit-tree "git" "" nil) + (autoload 'git-empty-db-p "git" "" nil) + (autoload 'git-get-merge-heads "git" "" nil) + (autoload 'git-get-commit-description "git" "" nil) + (autoload 'git-clear-status "git" "" nil) + (autoload 'git-set-fileinfo-state "git" "" nil) + (autoload 'git-status-filenames-map "git" "" nil) + (autoload 'git-set-filenames-state "git" "" nil) + (autoload 'git-state-code "git" "" nil) + (autoload 'git-status-code-as-string "git" "" nil) + (autoload 'git-file-type-as-string "git" "" nil) + (autoload 'git-rename-as-string "git" "" nil) + (autoload 'git-permissions-as-string "git" "" nil) + (autoload 'git-fileinfo-prettyprint "git" "" nil) + (autoload 'git-insert-info-list "git" "" nil) + (autoload 'git-run-diff-index "git" "" nil) + (autoload 'git-find-status-file "git" "" nil) + (autoload 'git-run-ls-files "git" "" nil) + (autoload 'git-run-ls-files-cached "git" "" nil) + (autoload 'git-run-ls-unmerged "git" "" nil) + (autoload 'git-get-exclude-files "git" "" nil) + (autoload 'git-run-ls-files-with-excludes "git" "" nil) + (autoload 'git-update-status-files "git" "" nil) + (autoload 'git-mark-files "git" "" nil) + (autoload 'git-marked-files "git" "" nil) + (autoload 'git-marked-files-state "git" "" nil) + (autoload 'git-refresh-files "git" "" nil) + (autoload 'git-refresh-ewoc-hf "git" "" nil) + (autoload 'git-get-filenames "git" "" nil) + (autoload 'git-update-index "git" "" nil) + (autoload 'git-run-pre-commit-hook "git" "" nil) + (autoload 'git-do-commit "git" "" t) + (autoload 'git-mark-file "git" "" t) + (autoload 'git-unmark-file "git" "" t) + (autoload 'git-unmark-file-up "git" "" t) + (autoload 'git-mark-all "git" "" t) + (autoload 'git-unmark-all "git" "" t) + (autoload 'git-toggle-all-marks "git" "" t) + (autoload 'git-next-file "git" "" t) + (autoload 'git-prev-file "git" "" t) + (autoload 'git-next-unmerged-file "git" "" t) + (autoload 'git-prev-unmerged-file "git" "" t) + (autoload 'git-add-file "git" "" t) + (autoload 'git-ignore-file "git" "" t) + (autoload 'git-remove-file "git" "" t) + (autoload 'git-revert-file "git" "" t) + (autoload 'git-resolve-file "git" "" t) + (autoload 'git-remove-handled "git" "" t) + (autoload 'git-toggle-show-uptodate "git" "" t) + (autoload 'git-toggle-show-ignored "git" "" t) + (autoload 'git-toggle-show-unknown "git" "" t) + (autoload 'git-expand-directory "git" "" nil) + (autoload 'git-setup-diff-buffer "git" "" nil) + (autoload 'git-diff-file "git" "" t) + (autoload 'git-diff-file-merge-head "git" "" t) + (autoload 'git-diff-unmerged-file "git" "" nil) + (autoload 'git-diff-file-base "git" "" t) + (autoload 'git-diff-file-mine "git" "" t) + (autoload 'git-diff-file-other "git" "" t) + (autoload 'git-diff-file-combined "git" "" t) + (autoload 'git-diff-file-idiff "git" "" t) + (autoload 'git-log-file "git" "" t) + (autoload 'git-log-edit-files "git" "" nil) + (autoload 'git-log-edit-diff "git" "" nil) + (autoload 'git-append-sign-off "git" "" nil) + (autoload 'git-setup-log-buffer "git" "" nil) + (autoload 'git-commit-file "git" "" t) + (autoload 'git-setup-commit-buffer "git" "" nil) + (autoload 'git-get-commit-files "git" "" nil) + (autoload 'git-amend-commit "git" "" t) + (autoload 'git-find-file "git" "" t) + (autoload 'git-find-file-other-window "git" "" t) + (autoload 'git-find-file-imerge "git" "" t) + (autoload 'git-view-file "git" "" t) + (autoload 'git-refresh-status "git" "" t) + (autoload 'git-status-quit "git" "" t) + (autoload 'git-status-mode "git" "" nil) + (autoload 'git-find-status-buffer "git" "" nil) + (autoload 'git-status "git" "" t) + (autoload 'git-update-saved-file "git" "" nil) + (autoload 'git-help "git" "" t) + + (autoload 'git-blame-color-scale "git-blame" "" nil) + (autoload 'git-blame-random-pop "git-blame" "" nil 'macro) + (autoload 'git-blame-mode "git-blame" "" t) + (autoload 'git-blame-mode-on "git-blame" "" nil) + (autoload 'git-blame-mode-off "git-blame" "" nil) + (autoload 'git-reblame "git-blame" "Minor mode for incremental blame for Git" t) + (autoload 'git-blame-run "git-blame" "" nil) + (autoload 'remove-git-blame-text-properties "git-blame" "" nil) + (autoload 'git-blame-cleanup "git-blame" "" nil) + (autoload 'git-blame-update-region "git-blame" "" nil) + (autoload 'git-blame-sentinel "git-blame" "" nil) + (autoload 'git-blame-filter "git-blame" "" nil) + (autoload 'git-blame-parse "git-blame" "" nil) + (autoload 'git-blame-new-commit "git-blame" "" nil) + (autoload 'git-blame-add-info "git-blame" "" nil) + (autoload 'git-blame-current-commit "git-blame" "" nil) + (autoload 'git-describe-commit "git-blame" "" nil) + (autoload 'git-blame-identify "git-blame" "" t) + (autoload 'git-blame-after-change "git-blame" "" nil) + (autoload 'git-blame-enq-update "git-blame" "" nil) + (autoload 'git-blame-delayed-update "git-blame" "" nil))) + +;; End of file --- git-core-1.6.0.4.orig/debian/git-core.conffiles +++ git-core-1.6.0.4/debian/git-core.conffiles @@ -0,0 +1,2 @@ +/etc/bash_completion.d/git +/etc/emacs/site-start.d/50git-core.el --- git-core-1.6.0.4.orig/debian/git-daemon-run.prerm +++ git-core-1.6.0.4/debian/git-daemon-run.prerm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || test "$1" = 'deconfigure' || \ + test "$1" = 'failed-upgrade' || exit 0 + +update-service --remove /etc/sv/git-daemon || : --- git-core-1.6.0.4.orig/debian/changelog.upstream.sh +++ git-core-1.6.0.4/debian/changelog.upstream.sh @@ -0,0 +1,15 @@ +#!/bin/sh +: >debian/changelog.upstream +exec debian/changelog.upstream."$new" + echo "Version $new; changes since $old:" + echo "Version $new; changes since $old:" |tr '[:print:]' - + echo + git shortlog --no-merges "$old".."$new" + echo + cat debian/changelog.upstream + mv debian/changelog.upstream."$new" debian/changelog.upstream + old="$new" +done --- git-core-1.6.0.4.orig/debian/changelog.upstream +++ git-core-1.6.0.4/debian/changelog.upstream @@ -0,0 +1,16942 @@ +Version v1.6.0.4; changes since v1.6.0.3: +----------------------------------------- + +Alex Riesen (10): + Add mksnpath which allows you to specify the output buffer + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c + Fix potentially dangerous uses of mkpath and git_path + Plug a memleak in builtin-revert + Add git_snpath: a .git path formatting routine with output buffer + Fix potentially dangerous use of git_path in ref.c + git_pathdup: returns xstrdup-ed copy of the formatted path + Use git_pathdup instead of xstrdup(git_path(...)) + Add --verbose|-v to test-chmtime + Use test-chmtime -v instead of perl in t5000 to get mtime of a file + +Charles Bailey (1): + git-archive: work in bare repos + +Christian Jaeger (1): + Git.pm: do not break inheritance + +Clemens Buchacher (2): + do not force write of packed refs + push: fix local refs update if already up-to-date + +Deskin Miller (2): + git-svn: change dashed git-config to git config + git-svn: change dashed git-commit-tree to git commit-tree + +Gustaf Hendeby (1): + git-gui: Help identify aspell version on Windows too + +Jakub Narebski (1): + Documentation/gitattributes: Add subsection header for each attribute + +Jan Krüger (1): + Documentation: clarify information about 'ident' attribute + +Jeff King (5): + refactor handling of "other" files in ls-files and status + correct cache_entry allocation + pack-objects: avoid reading uninitalized data + fix overlapping memcpy in normalize_absolute_path + send-pack: do not send out single-level refs such as refs/stash + +Johannes Schindelin (1): + Fix fetch/pull when run without --update-head-ok + +Jonas Fonseca (1): + asciidoc: add minor workaround to add an empty line after code blocks + +Junio C Hamano (9): + pull: allow "git pull origin $something:$current_branch" into an unborn branch + Fix "checkout --track -b newbranch" on detached HEAD + reset --hard/read-tree --reset -u: remove unmerged new paths + demonstrate breakage of detached checkout with symbolic link HEAD + Enhance hold_lock_file_for_{update,append}() API + Start 1.6.0.4 cycle + Update draft 1.6.0.4 release notes + format-patch documentation: mention the special case of showing a single commit + GIT 1.6.0.4 + +Linus Torvalds (1): + Add file delete/create info when we overflow rename_limit + +Markus Heidelberg (1): + bash completion: add doubledash to "git show" + +Mikael Magnusson (1): + Document that git-log takes --all-match. + +Miklos Vajna (5): + Fix git branch -m for symrefs. + rename_ref(): handle the case when the reflog of a ref does not exist + Fix git update-ref --no-deref -d. + git branch -m: forbid renaming of a symref + update-ref --no-deref -d: handle the case when the pointed ref is packed + +Nanako Shiraishi (1): + Install git-cvsserver in $(bindir) + +Pierre Habouzit (1): + git send-email: avoid leaking directory file descriptors. + +Quy Tonthat (1): + Update RPM spec for the new location of git-cvsserver. + +Thomas Rast (1): + add -p: warn if only binary changes present + +Tom Preston-Werner (1): + add instructions on how to send patches to the mailing list with Gmail + +Tommi Virtanen (1): + Install git-shell in bindir, too + +Yann Dirson (1): + Add reference for status letters in documentation. + + +Version v1.6.0.3; changes since v1.6.0.2: +----------------------------------------- + +Abhijit Bhopatkar (1): + Documentation: Clarify '--signoff' for git-commit + +Alec Berryman (2): + git-svn: factor out svnserve test code for later use + git-svn: Always create a new RA when calling do_switch for svn:// + +Alex Riesen (3): + Remove empty directories in recursive merge + Add remove_path: a function to remove as much as possible of a path + Use remove_path from dir.c instead of own implementation + +Alexander Gavrilov (1): + builtin-blame: Fix blame -C -C with submodules. + +Björn Steinbrink (1): + force_object_loose: Fix memory leak + +Brandon Casey (14): + t9700/test.pl: avoid bareword 'STDERR' in 3-argument open() + t9700/test.pl: remove File::Temp requirement + diff.c: return pattern entry pointer rather than just the hunk header pattern + diff.c: associate a flag with each pattern and use it for compiling regex + diff.*.xfuncname which uses "extended" regex's for hunk header selection + t4018-diff-funcname: test syntax of builtin xfuncname patterns + builtin-prune.c: prune temporary packs in /pack directory + git-stash.sh: don't default to refs/stash if invalid ref supplied + builtin-merge.c: allocate correct amount of memory + git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) + remote.c: correct the check for a leading '/' in a remote name + t4018-diff-funcname: rework negated last expression test + t4018-diff-funcname: demonstrate end of line funcname matching flaw + xdiff-interface.c: strip newline (and cr) from line before pattern matching + +Charles Bailey (2): + Add new test to demonstrate git archive core.autocrlf inconsistency + Make git archive respect core.autocrlf when creating zip format archives + +Chris Frey (1): + Documentation: clarify the details of overriding LESS via core.pager + +Dan McGee (1): + contrib: update packinfo.pl to not use dashed commands + +Daniel Barkalow (1): + Check early that a new branch is new and valid + +David Soria Parra (1): + Solaris: Use OLD_ICONV to avoid compile warnings + +Deskin Miller (2): + maint: check return of split_cmdline to avoid bad config strings + git init: --bare/--shared overrides system/global config + +Dmitry Potapov (4): + git-rebase-interactive: do not squash commits on abort + git-rebase--interactive: auto amend only edited commit + make prefix_path() never return NULL + do not segfault if make_cache_entry failed + +Eric Raible (1): + completion: git commit should list --interactive + +Eric Wong (1): + git-svn: fix handling of even funkier branch names + +Fabrizio Chiarello (1): + builtin-clone: fix typo + +Garry Dolley (1): + Clarified gitattributes documentation regarding custom hunk header. + +Giuseppe Bilotta (1): + gitweb: remove PATH_INFO from $my_url and $my_uri + +Heikki Orsila (2): + Start conforming code to "git subcmd" style part 3 + Cosmetical command name fix + +Imre Deak (1): + builtin-apply: fix typo leading to stack corruption + +Jakub Narebski (2): + gitweb: Fix two 'uninitialized value' warnings in git_tree() + gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh + +Jeff King (3): + Makefile: do not set NEEDS_LIBICONV for Solaris 8 + git apply --directory broken for new files + tests: shell negation portability fix + +Joey Hess (1): + gitweb: avoid warnings for commits without body + +Johan Herland (2): + for-each-ref: Fix --format=%(subject) for log message without newlines + Use strchrnul() instead of strchr() plus manual workaround + +Johannes Schindelin (2): + git rm: refresh index before up-to-date check + rebase -i: do not fail when there is no commit to cherry-pick + +Johannes Sixt (2): + git-remote: do not use user input in a printf format string + git-push.txt: Describe --repo option in more detail + +Jonas Fonseca (2): + checkout: Do not show local changes when in quiet mode + git-check-attr(1): add output and example sections + +Junio C Hamano (15): + discard_cache: reset lazy name_hash bit + diff Porcelain: do not disable auto index refreshing on -C -C + diff --quiet: make it synonym to --exit-code >/dev/null + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set + Fix permission bits on sources checked out with an overtight umask + checkout: do not lose staged removal + diff/diff-files: do not use --cc too aggressively + Start draft release notes for 1.6.0.3 + diff: use extended regexp to find hunk headers + diff hunk pattern: fix misconverted "\{" tex macro introducers + Update draft release notes to 1.6.0.3 + diff(1): clarify what "T"ypechange status means + Hopefully the final draft release notes update before 1.6.0.3 + Fix testcase failure when extended attributes are in use + GIT 1.6.0.3 + +Linus Torvalds (1): + fix bogus "diff --git" header from "diff --no-index" + +Luc Heinrich (1): + git-svn: call 'fatal' correctly in set-tree + +Matt McCutchen (1): + t1301-shared-repo.sh: don't let a default ACL interfere with the test + +Michael J Gruber (1): + make "git remote" report multiple URLs + +Michael Prokop (1): + Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606) + +Mikael Magnusson (4): + Typo "bogos" in format-patch error message. + git-repack uses --no-repack-object, not --no-repack-delta. + Fix a few typos in relnotes + Typo "does not exists" when git remote update remote. + +Miklos Vajna (2): + test-lib: fix color reset in say_color() + Add testcase to ensure merging an early part of a branch is done properly + +Nanako Shiraishi (2): + docs: describe pre-rebase hook + Teach rebase -i to honor pre-rebase hook + +Nicolas Pitre (2): + fix pread()'s short read in index-pack + rehabilitate 'git index-pack' inside the object store + +Petr Baudis (1): + Do not perform cross-directory renames when creating packs + +Ping Yin (1): + git-submodule: Fix "Unable to checkout" for the initial 'update' + +Rafael Garcia-Suarez (1): + Clarify commit error message for unmerged files + +SZEDER Gábor (5): + t0024: add executable permission + Documentation: remove '\' in front of short options + rebase -i: proper prepare-commit-msg hook argument when squashing + rebase -i: remove leftover debugging + bash: remove fetch, push, pull dashed form leftovers + +Samuel Tardieu (1): + Do not use errno when pread() returns 0 + +Shawn O. Pearce (3): + Update release notes for 1.6.0.3 + Update release notes for 1.6.0.3 + test-lib: fix broken printf + +Stephen Haberman (1): + Clarify how the user can satisfy stash's 'dirty state' check. + +Thomas Rast (1): + sha1_file: link() returns -1 on failure, not errno + +Todd Zullinger (1): + Use dashless git commands in setgitperms.perl + +Tuncer Ayaz (1): + Fix fetch/clone --quiet when stdout is connected + +Yann Dirson (1): + Bust the ghost of long-defunct diffcore-pathspec. + +martin f. krafft (1): + Improve git-log documentation wrt file filters + + +Version v1.6.0.2; changes since v1.6.0.1: +----------------------------------------- + +Alex Riesen (1): + Fix use of hardlinks in "make install" + +Alexander Gavrilov (1): + git-gui: Fix string escaping in po2msg.sh + +Alexandre Bourget (2): + git-gui: Update french translation + git-gui: update all remaining translations to French. + +Andreas Färber (1): + Makefile: always provide a fallback when hardlinks fail + +Arjen Laarhoven (1): + Use compatibility regex library for OSX/Darwin + +Ask Bjørn Hansen (1): + Document sendemail.envelopesender configuration + +Björn Steinbrink (1): + for-each-ref: Allow a trailing slash in the patterns + +Clemens Buchacher (2): + git gui: show diffs with a minimum of 1 context line + clone: fix creation of explicitly named target directory + +Gustaf Hendeby (1): + Document clarification: gitmodules, gitattributes + +Heikki Orsila (3): + Start conforming code to "git subcmd" style + Improve documentation for --dirstat diff option + Start conforming code to "git subcmd" style part 2 + +Jeff King (4): + Fix "git log -i --grep" + pretty=format: respect date format options + checkout: fix message when leaving detached HEAD + Use compatibility regex library also on FreeBSD + +Johan Herland (1): + Bring local clone's origin URL in line with that of a remote clone + +Johannes Sixt (1): + Use compatibility regex library also on AIX + +Jonas Fonseca (1): + Fix passwd(5) ref and reflect that commit doens't use commit-tree + +Junio C Hamano (17): + ctype.c: protect tiny C preprocessor constants + shell: do not play duplicated definition games to shrink the executable + Fix example in git-name-rev documentation + git-apply: Loosen "match_beginning" logic + checkout: do not check out unmerged higher stages randomly + gitattributes: -crlf is not binary + diff: Help "less" hide ^M from the output + 'git foo' program identifies itself without dash in die() messages + Start 1.6.0.2 maintenance cycle + diff --cumulative is a sub-option of --dirstat + log --author/--committer: really match only with name part + "blame -c" should be compatible with "annotate" + Mention the fact that 'git annotate' is only for backward compatibility. + stash: refresh the index before deciding if the work tree is dirty + Update draft release notes for 1.6.0.2 + Update draft release notes for 1.6.0.2 + GIT 1.6.0.2 + +Linus Torvalds (2): + index-pack: be careful after fixing up the header/footer + Fix '--dirstat' with cross-directory renaming + +Marcus Griep (2): + Git.pm: Use File::Temp->tempfile instead of ->new + git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl + +Miklos Vajna (2): + Makefile: add merge_recursive.h to LIB_H + t7501: always use test_cmp instead of diff + +Nanako Shiraishi (4): + tests: use "git xyzzy" form (t0000 - t3599) + tests: use "git xyzzy" form (t3600 - t6999) + tests: use "git xyzzy" form (t7000 - t7199) + tests: use "git xyzzy" form (t7200 - t9001) + +Nguyễn Thái Ngọc Duy (6): + index-pack: setup git repository + diff*: fix worktree setup + grep: fix worktree setup + read-tree: setup worktree if merge is required + update-index: fix worktree setup + setup_git_directory(): fix move to worktree toplevel directory + +Nicolas Pitre (7): + discard revindex data when pack list changes + pack-objects: improve returned information from write_one() + improve reliability of fixup_pack_header_footer() + pack-objects: use fixup_pack_header_footer()'s validation mode + index-pack: use fixup_pack_header_footer()'s validation mode + fixup_pack_header_footer(): use nicely aligned buffer sizes + improve handling of sideband message display + +Paolo Bonzini (1): + make git-shell paranoid about closed stdin/stdout/stderr + +Paolo Ciarrocchi (1): + tutorial: gentler illustration of Alice/Bob workflow using gitk + +Petr Baudis (1): + bash completion: Hide more plumbing commands + +Ralf Wildenhues (1): + Fix some manual typos. + +Ramsay Allan Jones (2): + Fix a warning (on cygwin) to allow -Werror + Suppress some bash redirection error messages + +SZEDER Gábor (3): + Documentation: fix reference to a for-each-ref option + Documentation: fix disappeared lines in 'git stash' manpage + Documentation: minor cleanup in a use case in 'git stash' manual + +Shawn O. Pearce (2): + pack-objects: Allow missing base objects when creating thin packs + git-gui: Fix diff parsing for lines starting with "--" or "++" + +Teemu Likonen (1): + config.txt: Add missing colons after option name + +Yann Dirson (1): + Document gitk --argscmd flag. + + +Version v1.6.0.1; changes since v1.6.0: +--------------------------------------- + +Alexander Gavrilov (1): + Respect core.autocrlf in combined diff + +Brandon Casey (3): + t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0' + revision.h: make show_early_output an extern which is defined in revision.c + compat/snprintf.c: handle snprintf's that always return the # chars transmitted + +Don Zickus (1): + mailinfo: re-fix MIME multipart boundary parsing + +Eric Raible (1): + Completion: add missing '=' for 'diff --diff-filter' + +Eric Wong (1): + git-svn: fix dcommit to urls with embedded usernames + +Jeff King (2): + mailinfo: avoid violating strbuf assertion + decorate: allow const objects to be decorated + +Jim Meyering (2): + git format-patch: avoid underrun when format.headers is empty or all NLs + remote.c: remove useless if-before-free test + +Johannes Sixt (1): + Install templates with the user and group of the installing personality + +Jonathan Nieder (2): + Documentation: clarify pager. configuration + Documentation: clarify pager configuration + +Junio C Hamano (9): + Start 1.6.0.X maintenance series + diff --check: do not get confused by new blank lines in the middle + for-each-ref: cope with tags with incomplete lines + completion: find out supported merge strategies correctly + "git-merge": allow fast-forwarding in a stat-dirty tree + Update draft release notes for 1.6.0.1 + unpack_trees(): protect the handcrafted in-core index from read_cache() + merge: fix numerus bugs around "trivial merge" area + GIT 1.6.0.1 + +Miklos Vajna (2): + Fix 'git help help' + Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX + +Robert Schiele (1): + adapt git-cvsserver manpage to dash-free syntax + +Simon Hausmann (1): + Clean up the git-p4 documentation + +Tarmigan Casebolt (1): + Add hints to revert documentation about other ways to undo changes + +Tor Arvid Lund (1): + git-p4: Fix one-liner in p4_write_pipe function. + + +Version v1.6.0; changes since v1.6.0-rc3: +----------------------------------------- + +Alex Riesen (1): + Fix t3700 on filesystems which do not support question marks in names + +Alexander Gavrilov (1): + gitk: Allow safely calling nukefile from a run queue handler + +Anand Kumria (14): + Create a specific version of the read_pipe_lines command for p4 invocations + Utilise the new 'p4_read_pipe_lines' command + Have a command that specifically invokes 'p4' (via system) + Utilise the new 'p4_system' function. + Add a single command that will be used to construct the 'p4' command + If we are in verbose mode, output what we are about to run (or return) + Switch to using 'p4_build_cmd' + If the user has configured various parameters, use them. + Consistently use 'git-p4' for the configuration entries + Move git-p4.syncFromOrigin into a configuration parameters section + Put some documentation in about the parameters that have been added + Put in the two other configuration elements found in the source + Add p4 read_pipe and write_pipe wrappers + Utilise our new p4_read_pipe and p4_write_pipe wrappers + +Brandon Casey (2): + test-parse-options: use appropriate cast in length_callback + t5304-prune: adjust file mtime based on system time rather than file mtime + +Eric Blake (1): + Makefile: building git in cygwin 1.7.0 + +Eric Raible (1): + bash completion: 'git apply' should use 'fix' not 'strip' + +Junio C Hamano (1): + GIT 1.6.0 + +Kevin Ballard (1): + Fix escaping of glob special characters in pathspecs + +Lee Marlow (2): + bash completion: Add completion for 'git mergetool' + bash completion: Add '--merge' long option for 'git log' + +Marcus Griep (2): + bash-completion: Add non-command git help files to bash-completion + Git.pm: Make File::Spec and File::Temp requirement lazy + +Matt McCutchen (1): + git format-patch documentation: clarify what --cover-letter does + +Miklos Vajna (2): + Documentation: document the pager.* configuration setting + t9300: replace '!' with test_must_fail + +Robert Blum (1): + git-p4: chdir now properly sets PWD environment variable in msysGit + +Shawn O. Pearce (1): + git-gui 0.11 + +Stephan Beyer (3): + git-am: ignore --binary option + git-stash: improve synopsis in help and manual page + Improve error output of git-rebase + +Thomas Rast (2): + rebase -i -p: handle index and workdir correctly + rebase -i -p: fix parent rewriting + + +Version v1.6.0-rc3; changes since v1.6.0-rc2: +--------------------------------------------- + +Brandon Casey (2): + Makefile: set SHELL to value of SHELL_PATH + Makefile: add a target which will abort compilation with ancient shells + +Eric Wong (2): + git-svn: add ability to specify --commit-url for dcommit + git-svn: wrap long lines in a few places + +Francis Moreau (1): + git-bisect: fix wrong usage of read(1) + +Gustaf Hendeby (2): + gitattributes: Document built in hunk header patterns + Teach git diff about BibTeX head hunk patterns + +Ivan Stankovic (1): + Documentation: fix invalid reference to 'mybranch' in user manual + +Johannes Schindelin (1): + clone --mirror: avoid storing repeated tags + +Jonathan Nieder (1): + Documentation: user-manual: "git commit -a" doesn't motivate .gitignore + +Junio C Hamano (9): + asciidoc markup fixes + GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files + mailinfo: fix MIME multi-part message boundary handling + Update draft RelNotes for 1.6.0 + Fix deleting reflog entries from HEAD reflog + Re-fix rev-list-options documentation + diff --check: do not unconditionally complain about trailing empty lines + Do not talk about "diff" in rev-list documentation. + GIT 1.6.0-rc3 + +Marcus Griep (5): + Fix multi-glob assertion in git-svn + git-svn: Allow deep branch names by supporting multi-globs + Git.pm: Add faculties to allow temp files to be cached + git-svn: Make it incrementally faster by minimizing temp files + git-svn: Reduce temp file usage when dealing with non-links + +Nguyễn Thái Ngọc Duy (1): + Fix typo in comments of longest_ancestor_length() + +Petr Baudis (2): + Fail properly when cloning from invalid HTTP URL + Adjust for the new way of enabling the default post-update hook + +Pieter de Bie (2): + builtin-rm: Add a --force flag + reflog test: add more tests for 'reflog delete' + +SZEDER Gábor (1): + bash: remove redundant check for 'git stash apply' options + +Stephen R. van den Berg (1): + git-daemon: SysV needs the signal handler reinstated. + +Thomas Rast (6): + Documentation: commit-tree: remove 16 parents restriction + Documentation: filter-branch: document how to filter all refs + filter-branch: be more helpful when an annotated tag changes + Documentation: rev-list-options: Fix -g paragraph formatting + Documentation: rev-list-options: Fix a typo + Documentation: rev-list-options: Rewrite simplification descriptions for clarity + + +Version v1.6.0-rc2; changes since v1.6.0-rc1: +--------------------------------------------- + +Abhijit Menon-Sen (7): + `git submodule add` now requires a + Make it clear that push can take multiple refspecs + Make the DESCRIPTION match ... items in the SYNOPSIS + Git.pm: localise $? in command_close_bidi_pipe() + Fix hash slice syntax error + Fix typo in perl/Git.pm + Fix typos in INSTALL + +Alex Riesen (1): + Make use of stat.ctime configurable + +Alexander Gavrilov (9): + git-gui: Fix the Remote menu separator. + git-gui: Preserve scroll position on reshow_diff. + Support copy and rename detection in fast-export. + gitk: Kill back-end processes on window close + gitk: Arrange to kill diff-files & diff-index on quit + gitk: On Windows, use a Cygwin-specific flag for kill + gitk: Fixed broken exception handling in diff + gitk: Fixed automatic row selection during load + gitk: Fallback to selecting the head commit upon load + +Anders Melchiorsen (4): + Advertise the ability to abort a commit + Documentation: fix diff.external example + Flush output in start_async + Add output flushing before fork() + +Avery Pennarun (2): + Teach "git diff -p" Pascal/Delphi funcname pattern + git-svn: Abort with an error if 'fetch' parameter is invalid. + +Brandon Casey (3): + t/t4202-log.sh: add newline at end of file + Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long + perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section + +Brian Gernhardt (1): + Documentation: Remove mentions of git-svnimport. + +Cesar Eduardo Barros (1): + Documentation/git-rev-parse.txt: update for new git-describe output format + +Christian Couder (2): + merge-base: die with an error message if not passed a commit ref + documentation: user-manual: update "using-bisect" section + +Christian Stimming (2): + git-gui: Update German translation + gitk: Updated German translation + +Ciaran McCreesh (1): + Make git-add -i accept ranges like 7- + +David D. Kilzer (1): + Fix race condition in t9119-git-svn-info.sh + +Dmitry Potapov (1): + correct access right for git-svn-dcommit test + +Eric Wong (2): + git-svn: properly set path for "info" command + t9119: conditionally re-enable test depending on svn(1) version + +Giuseppe Bilotta (2): + diff: add ruby funcname pattern + diff: chapter and part in funcname for tex + +Jeff King (3): + init: handle empty "template" parameter + Compact commit template message + init: handle empty "template" parameter + +Jim Meyering (1): + git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. + +Johannes Schindelin (3): + sort_in_topological_order(): avoid setting a commit flag + clone: Add an option to set up a mirror + clone --bare: Add ".git" suffix to the directory name to clone into + +Johannes Sixt (1): + git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' + +Jon Jensen (1): + Fix reference to Everyday Git, which is an HTML document and not a man page. + +Jonathan Nieder (1): + git-diff(1): "--c" -> "--cc" typo fix + +Junio C Hamano (19): + Allow building without any git installed + Allow installing in the traditional way + ls-tree documentation: enhance notes on subdirectory and pathspec behaviour + Documentation: clarify what is shown in "git-ls-files -s" output + t7001: fix "git mv" test + Teach gitlinks to ie_modified() and ce_modified_check_fs() + Fix merge name generation in "merge in C" + Fix test-parse-options "integer" test + Teach --find-copies-harder to "git blame" + make sure parsed wildcard refspec ends with slash + Documentation: clarify diff --cc + Update my e-mail address + Start 1.5.6.5 RelNotes to describe accumulated fixes + builtin-name-rev.c: split deeply nested part from the main function + RelNotes 1.5.6.5 updates + fix diff-tree --stdin documentation + Files given on the command line are relative to $cwd + GIT 1.5.6.5 + GIT 1.6.0-rc2 + +Kevin Ballard (1): + format-patch: Produce better output with --inline or --attach + +Lee Marlow (11): + bash completion: remove unused function _git_diff_tree + bash completion: Add more long options for 'git log' + bash completion: Add completion for 'git grep' + bash completion: Add completion for 'git clone' + bash completion: Add completion for 'git clean' + bash completion: Add completion for 'git init' + bash completion: Add completion for 'git revert' + bash completion: More completions for 'git stash' + bash completion: Add completion for 'git archive' + bash completion: Add completion for 'git ls-files' + bash completion: Add completion for 'git mv' + +Linus Torvalds (1): + diff.renamelimit is a basic diff configuration + +Michele Ballabio (2): + git-gui: update po/it.po + git-gui: add a part about format strings in po/README + +Mikael Magnusson (2): + git-gui: Update swedish translation. + gitk: Update swedish translation. + +Mike Ralphson (2): + Documentation: typos / spelling fixes in older RelNotes + Documentation: typos / spelling fixes + +Nanako Shiraishi (1): + git-gui: update Japanese translation + +Olivier Marin (1): + builtin-verify-tag: fix -v option parsing + +Pierre Habouzit (2): + Allow "non-option" revision options in parse_option-enabled commands + git-submodule: move ill placed shift. + +Pieter de Bie (1): + git-name-rev: allow --name-only in combination with --stdin + +René Scharfe (2): + archive: allow --exec and --remote without equal sign + git-name-rev: don't use printf without format + +Shawn O. Pearce (2): + git-gui: Fix gitk search in $PATH to work on Windows + git-gui: Update git-gui.pot for 0.11 nearing release + +Steffen Prohaska (6): + Refactor, adding prepare_git_cmd(const char **argv) + run-command (Windows): Run dashless "git " + git-gui: Correct installation of library to be $prefix/share + git-gui (Windows): Switch to relative discovery of oguilib + git-gui (Windows): Change wrapper to execdir 'libexec/git-core' + Modify mingw_main() workaround to avoid link errors + +Stephan Beyer (1): + builtin-revert.c: typofix + +Steve Haslam (1): + Propagate -u/--upload-pack option of "git clone" to transport. + +Steven Grimm (1): + Optimize sha1_object_info for loose objects, not concurrent repacks + +Todd Zullinger (1): + Replace uses of "git-var" with "git var" + + +Version v1.6.0-rc1; changes since v1.6.0-rc0: +--------------------------------------------- + +Abhijit Menon-Sen (2): + git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core + Clarify that "git log x.c y.h" lists commits that touch either file + +Alex Riesen (1): + Allow pager of diff command be enabled/disabled + +Alexander Gavrilov (4): + Fix pre-commit hooks under MinGW/MSYS + Add options to control the search for copies in blame. + Kill the blame back-end on window close. + Add a menu item to invoke full copy detection in blame. + +Anders Melchiorsen (1): + Documentation: fix diff.external example + +Björn Steinbrink (2): + index-pack.c: correctly initialize appended objects + rev-parse: Add support for the ^! and ^@ syntax + +Brad King (1): + git-svn: teach dcommit about svn auto-props + +Brandon Casey (7): + t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff + t4116-apply-reverse.sh: use $TAR rather than tar + t3200,t7201: replace '!' with test_must_fail + t7502-commit.sh: rearrange test to make more portable + t/t4202-log.sh: add newline at end of file + Teach fsck and prune about the new location of temporary objects + perl/Makefile: update NO_PERL_MAKEMAKER section + +Cesar Eduardo Barros (1): + Documentation/git-submodule.txt: fix doubled word + +Daniel Barkalow (1): + In perforce, RCS keywords are case-sensitive + +Jakub Narebski (1): + gitweb: More about how gitweb gets 'owner' of repository + +Johannes Schindelin (9): + Rename .git/rebase to .git/rebase-apply + Rename path_list to string_list + Fix two leftovers from path_list->string_list + Ignore dirty submodule states in "git pull --rebase" + Add test to show that show-branch misses out the 8th column + sort_in_topological_order(): avoid setting a commit flag + builtin-commit: Two trivial style-cleanups + git daemon: avoid waking up too often + Avoid chdir() in list_commands_in_dir() + +Johannes Sixt (12): + rebase -i: When an 'edit' stops, mention the commit + Makefile: Do not install a copy of 'git' in $(gitexecdir) + Makefile: Normalize $(bindir) and $(gitexecdir) before comparing + Record the command invocation path early + Fix relative built-in paths to be relative to the command invocation + Allow the built-in exec path to be relative to the command invocation path + Allow add_path() to add non-existent directories to the path + Windows: Make $(gitexecdir) relative + Windows: Make sure argv[0] has a path + Windows: Do not compile git-shell + git-gui: Fix "Stage/Unstage Line" with one line of context. + git-gui: "Stage Line": Treat independent changes in adjacent lines better + +Jonathan Nieder (3): + git-diff(1): "--c" -> "--cc" typo fix + document that git-tag can tag more than heads + t6030 (bisect): work around Mac OS X "ls" + +Junio C Hamano (13): + Update my e-mail address + Revert "make git-status use a pager" + tests: do not rely on external "patch" + stash save: fix parameter handling + builtin-branch.c: remove unused code in append_ref() callback function + builtin-branch.c: optimize --merged and --no-merged + Documentation: clarify diff --cc + ignore non-existent refs in dwim_log() + tests: propagate $(TAR) down from the toplevel Makefile + Makefile: fix shell quoting + Documentation: clarify how to disable elements in core.whitespace + make sure parsed wildcard refspec ends with slash + GIT 1.6.0-rc1 + +Lars Hjemli (3): + builtin-branch: remove duplicated code + builtin-branch: factor out merge_filter matching + builtin-branch: fix -v for --[no-]merged + +Lee Marlow (2): + bash completion: Add long options for 'git rm' + bash completion: Add completion for 'git help' + +Miklos Vajna (2): + builtin-merge: give a proper error message for invalid strategies in config + t7601: extend the 'merge picks up the best result' test + +Nikolaj Schumacher (1): + Don't cut off last character of commit descriptions. + +Olivier Marin (4): + git-am: remove dash from help message + parse-options: fix segmentation fault when a required value is missing + git am --skip: clean the index while preserving local changes + update test case to protect am --skip behaviour + +P. Christeas (1): + svnimport: newer libsvn wants us to ask for the root with "", not "/" + +Peter Valdemar Mørch (1): + send-email: find body-encoding correctly + +Petr Baudis (4): + git-filter-branch.sh: Allow running in bare repositories + Documentation/git-filter-branch: teach "rm" instead of "update-index --remove" + git-mv: Remove dead code branch + git-mv: Keep moved index entries inact + +Philippe Bruhat (1): + mailinfo: better parse email adresses containg parentheses + +Pierre Habouzit (4): + builtin-merge: add missing structure initialization + git-submodule: move ill placed shift. + git-checkout: fix command line parsing. + git-checkout: improve error messages, detect ambiguities. + +René Scharfe (5): + archive: add write_archive() + archive: move parameter parsing code to archive.c + archive: define MAX_ARGS where it's needed + archive: declare struct archiver where it's needed + archive: allow --exec and --remote without equal sign + +SZEDER Gábor (2): + checkout: mention '--' in the docs + bash: offer only paths after '--' for 'git checkout' + +Shawn O. Pearce (2): + git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk + fsck: Don't require tmp_obj_ file names are 14 bytes in length + +Stephan Beyer (7): + git-am: Add colon before the subject that is printed out as being applied + am --abort: Add to bash-completion and mention in git-rerere documentation + Make non-static functions, that may be static, static + Move launch_editor() from builtin-tag.c to editor.c + editor.c: Libify launch_editor() + git-am: Mention --abort in usage string part of OPTIONS_SPEC + git-reset: Let -q hush "locally modified" messages + +Steve Haslam (2): + Propagate -u/--upload-pack option of "git clone" to transport. + Remove references to git-fetch-pack from "git clone" documentation. + +Thomas Rast (2): + git-completion.bash: provide completion for 'show-branch' + bash completion: Add long options for 'git describe' + + +Version v1.6.0-rc0; changes since v1.5.6.5: +------------------------------------------- + +Abhijit Menon-Sen (4): + git-gui: Move on to the next filename after staging/unstaging a change + git-gui: Don't select the wrong file if the last listed file is staged. + Implement "git stash branch " + Add a test for "git stash branch" + +Adam Brewster (2): + Move read_revisions_from_stdin from builtin-rev-list.c to revision.c + Teach git-bundle to read revision arguments from stdin like git-rev-list. + +Alex Riesen (1): + Fix use of "perl -i" on Windows + +Alexander Gavrilov (4): + Fix quadratic performance in rewrite_one. + Avoid rescanning unchanged entries in search for copies. + Do not try to detect move/copy for entries below threshold. + Support gitlinks in fast-import. + +Avery Pennarun (1): + Reword "your branch has diverged..." lines to reduce line length + +Brandon Casey (1): + t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects + +Brian Gernhardt (4): + Fix t4017-diff-retval for white-space from wc + Add test results directory to t/.gitignore + Documentation: Point to gitcli(7) from git(1) + Documentation: mention ORIG_HEAD in am, merge, and rebase + +Christian Couder (2): + help: check early if we have a command, if not try a documentation topic + Fix "config_error_nonbool" used with value instead of key + +Ciaran McCreesh (1): + Make git-add -i accept ranges like 7- + +Cristian Peraferrer (1): + Print errno upon failure to open the COMMIT_EDITMSG file + +Daniel Barkalow (1): + Only use GIT_CONFIG in "git config", not other programs + +David Reiss (4): + Implement normalize_absolute_path + Fold test-absolute-path into test-path-utils + Add support for GIT_CEILING_DIRECTORIES + Eliminate an unnecessary chdir("..") + +Dmitry Kakurin (1): + Fixed text file auto-detection: treat EOF character 032 at the end of file as printable + +Dmitry Potapov (4): + update-hook-example: optionally allow non-fast-forward + shrink git-shell by avoiding redundant dependencies + completion.bash: add 'skip' and 'run' to git-bisect + git-svn: fix git svn info to work without arguments + +Don Zickus (1): + git-apply: handle a patch that touches the same path more than once better + +Eric Hanchrow (2): + user-manual: typo and grammar fixes + Documentation: fix broken "linkgit" links + +Eric Raible (3): + Documentation: tweak use case in "git stash save --keep-index" + completion: add branch options --contains --merged --no-merged + Teach lookup_prog not to select directories + +Eric Wong (1): + t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" + +Fabian Emmes (2): + Testsuite: Unset CVS_SERVER + testsuite for cvs co -c + +Frederik Schwarzer (1): + git-svn: typofix + +Ian Katz (1): + tutorial: use prompt with user names in example, to clarify who is doing what + +Jakub Narebski (4): + gitweb: Separate filling list of projects info + gitweb: Separate generating 'sort by' table header + t/README: Add 'Skipping Tests' section below 'Running Tests' + gitweb: Describe projects_index format in more detail + +Jeff King (9): + fix whitespace violations in test scripts + mask necessary whitespace policy violations in test scripts + avoid whitespace on empty line in automatic usage message + avoid trailing whitespace in zero-change diffstat lines + enable whitespace checking of test scripts + clone: create intermediate directories of destination repo + improve for-each-ref test script + Allow per-command pager config + avoid null SHA1 in oldest reflog + +Jing Xue (1): + Add 'git-p4.allowSubmit' to git-p4 + +Johan Herland (4): + Incorporate fetched packs in future object traversal + Move pack_refs() and friends into libgit + Prepare testsuite for a "git clone" that packs refs + Teach "git clone" to pack refs + +Johannes Schindelin (12): + Windows: always chmod(, 0666) before unlink(). + commit-tree: lift completely arbitrary limit of 16 parents + Allow git-apply to recount the lines in a hunk (AKA recountdiff) + Add another fast-import example, this time for .zip files + Teach "git apply" to prepend a prefix with "--root=" + git fetch-pack: do not complain about "no common commits" in an empty repo + Allow cherry-picking root commits + Convert CR/LF to LF in tag signatures + Move MERGE_RR from .git/rr-cache/ into .git/ + git-gui: MERGE_RR lives in .git/ directly with newer Git versions + shortlog: support --pretty=format: option + Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" + +Johannes Sixt (38): + Add compat/regex.[ch] and compat/fnmatch.[ch]. + Compile some programs only conditionally. + Add target architecture MinGW. + Windows: Use the Windows style PATH separator ';'. + setup.c: Prepare for Windows directory separators. + Windows: Treat Windows style path names. + Windows: Handle absolute paths in safe_create_leading_directories(). + Windows: Strip ".exe" from the program name. + Windows: Implement a wrapper of the open() function. + Windows: A minimal implemention of getpwuid(). + Windows: Work around misbehaved rename(). + Make my_mktime() public and rename it to tm_to_time_t() + Windows: Implement gettimeofday(). + Windows: Fix PRIuMAX definition. + Windows: Implement setitimer() and sigaction(). + Windows: Wrap execve so that shell scripts can be invoked. + Windows: A pipe() replacement whose ends are not inherited to children. + Windows: Implement start_command(). + Windows: A rudimentary poll() emulation. + Windows: Disambiguate DOS style paths from SSH URLs. + Windows: Implement asynchronous functions as threads. + Windows: Work around incompatible sort and find. + Windows: Implement wrappers for gethostbyname(), socket(), and connect(). + Windows: Implement a custom spawnve(). + Windows: Add a custom implementation for utime(). + Windows: Use a customized struct stat that also has the st_blocks member. + Turn builtin_exec_path into a function. + Windows: Compute the fallback for exec_path from the program invocation. + Windows: Use a relative default template_dir and ETC_GITCONFIG + When installing, be prepared that template_dir may be relative. + Windows: Make the pager work. + Windows: Work around an oddity when a pipe with no reader is written to. + Windows: Make 'git help -a' work. + Windows: TMP and TEMP environment variables specify a temporary directory. + git-gui: Implement "Stage/Unstage Line" + t4127-apply-same-fn: Avoid sed -i + Provide fallback definitions of PRIu32 and PRIx32 + builtin-clone: rewrite guess_dir_name() + +Jonathan Nieder (23): + Documentation: don't assume git-sh-setup and git-parse-remote are in PATH + Documentation: fix links to tutorials and other new manual pages + whitespace fix in Documentation/git-repack.txt + Documentation: complicate example of "man git-command" + git-daemon(1): don't assume git-daemon is in /usr/bin + Documentation: prepare to be consistent about "git-" versus "git " + Documentation: be consistent about "git-" versus "git " + Documentation formatting and cleanup + git-format-patch(1): fix stray \ in output + Documentation: fix gitlinks + manpages: fix bogus whitespace + git(1): add comma + git-commit(1): depersonalize description + Documentation: rewrap to prepare for "git-" vs "git " change + Documentation: more "git-" versus "git " changes + gitdiffcore(7): fix awkward wording + manpages: italicize command names in synopses + manpages: italicize command names + manpages: italicize git command names (which were in teletype font) + manpages: italicize gitk's name (where it was in teletype font) + manpages: italicize nongit command names (if they are in teletype font) + manpages: italicize git subcommand names (which were in teletype font) + manpages: use teletype font for sample command lines + +João Abecasis (1): + git-svn: find-rev and rebase for SVN::Mirror repositories + +Junio C Hamano (67): + revision traversal: --children option + rev-list --children + builtin-blame.c: move prepare_final() into a separate function. + builtin-blame.c: allow more than 16 parents + git-blame --reverse + rerere: rerere_created_at() and has_resolution() abstraction + git-rerere: detect unparsable conflicts + rerere: remove dubious "tail_optimization" + t4200: fix rerere test + rerere.autoupdate + git-shell: accept "git foo" form + Prepare execv_git_cmd() for removal of builtins from the filesystem + pre-rebase hook update + Ship sample hooks with .sample suffix + Keep some git-* programs in $(bindir) + Start draft release notes for 1.6.0 + diff --check: explain why we do not care whether old side is binary + check_and_emit_line(): rename and refactor + checkdiff: pass diff_options to the callback + Teach "diff --check" about new blank lines at end + diff --check: detect leftover conflict markers + Update sample pre-commit hook to use "diff --check" + Document the double-dash "rev -- path" disambiguator + Per-ref reflog expiry configuration + Make default expiration period of reflog used for stash infinite + t9700: skip when Test::More is not available + Update draft release notes for 1.6.0 + Introduce get_merge_bases_many() + Introduce reduce_heads() + Update draft release notes for 1.6.0 + apply --root: thinkofix. + Refactor "tracking statistics" code used by "git checkout" + git-status: show the remote tracking statistics + git-branch -v: show the remote tracking statistics + fast-export --export-marks: fix off by one error + stat_tracking_info(): clear object flags used during counting + branch -r -v: do not spit out garbage + git-apply --directory: make --root more similar to GNU diff + Update draft release notes for 1.6.0 + Teach "am" and "rebase" to mark the original position with ORIG_HEAD + Tone down warning about GNU Interactive Tools + Documentation: update sections on naming revisions and revision ranges + branch --contains: default to HEAD + branch --merged/--no-merged: allow specifying arbitrary commit + apply: fix copy/rename breakage + Teach merge.log to "git-merge" again + Update draft release notes for 1.6.0 + reduce_heads(): protect from duplicate input + git-rebase: report checkout failure + tutorial: clarify "pull" is "fetch + merge" + Update draft release notes to 1.6.0 + t/aggregate-results: whitespace fix + Update draft release notes for 1.6.0 + read-cache.c: typofix + mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line + rerere.autoupdate: change the message when autoupdate is in effect + builtin-remote.c: fix earlier "skip_prefix()" conversion + t9001 (send-email): Do not use hardcoded /bin/sh in test + .mailmap update + Getting closer to 1.6.0-rc0 + builtin-add.c: restructure the code for maintainability + git-add --all: add all files + git-add --all: tests + git-add --all: documentation + Link shell with compat layer functions + Move read_in_full() and write_in_full() to wrapper.c + "needs update" considered harmful + +Karl Hasselström (2): + Clean up builtin-update-ref's option parsing + Make old sha1 optional with git update-ref -d + +Kevin Ballard (1): + git-send-email: Accept fifos as well as files + +Lars Noschinski (3): + cvsserver: Add support for packed refs + cvsserver: Add cvs co -c support + cvsserver: Add testsuite for packed refs + +Lea Wiemann (6): + test-lib.sh: add --long-tests option + t/test-lib.sh: add test_external and test_external_without_stderr + Git.pm: add test suite + gitweb: standarize HTTP status codes + test-lib.sh: show git init output when in verbose mode + GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy + +Linus Torvalds (5): + Split up default "core" config parsing into helper routine + Split up default "user" config parsing into helper routine + Split up default "i18n" and "branch" config parsing into helper routines + Add config option to enable 'fsync()' of object files + Shrink the git binary a bit by avoiding unnecessary inline functions + +Lukas Sandström (4): + Add a helper script to send patches with Mozilla Thunderbird + Make some strbuf_*() struct strbuf arguments const. + Add some useful functions for strbuf manipulation. + git-mailinfo: use strbuf's instead of fixed buffers + +Marius Storm-Olsen (4): + Add an optional argument to commit/status -u|--untracked-files option + Add argument 'no' commit/status option -u|--untracked-files + Add configuration option for default untracked files mode + Windows: Add a new lstat and fstat implementation based on Win32 API. + +Mark Levedahl (3): + install-doc-quick - use git --exec-path to find git-sh-setup + git-submodule - make "submodule add" more strict, and document it + git-submodule - register submodule URL if adding in place + +Michele Ballabio (3): + t9301-fast-export.sh: Remove debug line + builtin-merge.c: Fix option parsing + builtin-push.c: Cleanup - use OPT_BIT() and remove some variables + +Mike Hommey (4): + Catch failures from t5540-http-push + Fix http-push test + Skip t5540-http-push test when USE_CURL_MULTI is undefined + Avoid apache complaining about lack of server's FQDN + +Mike Pape (1): + We need to check for msys as well as Windows in add--interactive. + +Miklos Vajna (27): + A simple script to parse the results from the testcases + Move split_cmdline() to alias.c + Move commit_list_count() to commit.c + Move parse-options's skip_prefix() to git-compat-util.h + Add new test to ensure git-merge handles pull.twohead and pull.octopus + Move read_cache_unmerged() to read-cache.c + git-fmt-merge-msg: make it usable from other builtins + Introduce get_octopus_merge_bases() in commit.c + Add new test to ensure git-merge handles more than 25 refs. + Add new test case to ensure git-merge reduces octopus parents when possible + Retire 'stupid' merge strategy + INSTALL: Update section about git-frotz form. + hg-to-git: avoid raising a string exception + hg-to-git: abort if the project directory is not a hg repo + hg-to-git: rewrite "git-frotz" to "git frotz" + hg-to-git: use git init instead of git init-db + Add new test case to ensure git-merge prepends the custom merge message + git-commit-tree: make it usable from other builtins + Fix t7601-merge-pull-config.sh on AIX + Build in merge + t0001-init.sh: change confusing directory name + t1007-hash-object.sh: use quotes for the test description + git-bisect: use dash-less form on git bisect log + make remove-dashes: apply to scripts and programs as well, not just to builtins + t6021: add a new test for git-merge-resolve + Add a new test for git-merge-resolve + Teach 'git merge' that some merge strategies no longer exist + +Nanako Shiraishi (7): + environment.c: remove unused function + config.c: make git_env_bool() static + gitcli: Document meaning of --cached and --index + cache-tree.c: make cache_tree_find() static + builtin-describe.c: make a global variable "pattern" static + parse-options.c: make check_typos() static + git am --abort + +Nguyễn Thái Ngọc Duy (1): + Move all dashed-form commands to libexecdir + +Nicolas Pitre (11): + call init_pack_revindex() lazily + implement some resilience against pack corruptions + test case for pack resilience against corruptions + refactor pack structure allocation + optimize verify-pack a bit + move show_pack_info() where it belongs + verify-pack: check packed object CRC when using index version 2 + verify-pack: test for detection of index v2 object CRC mismatch + repack.usedeltabaseoffset config option now defaults to "true" + pack.indexversion config option now defaults to 2 + restore legacy behavior for read_sha1_file() + +Olivier Marin (3): + Documentation: remove {show,whatchanged}.difftree config options + show_stats(): fix stats width calculation + builtin-rerere: more carefully find conflict markers + +Patrick Higgins (1): + Remove the use of '--' in merge program invocation + +Pavel Roskin (1): + t9600: allow testing with cvsps 2.2, including beta versions + +Peter Harris (1): + Add ANSI control code emulation for the Windows console + +Petr Baudis (6): + Git.pm: Add remote_refs() git-ls-remote frontend + Documentation/git-submodule.txt: Add Description section + Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles + Documentation/git-submodule.txt: Further clarify the description + Documentation: How to ignore local changes in tracked files + Documentation/git-merge.txt: Partial rewrite of How Merge Works + +Pierre Habouzit (13): + parse-opt: have parse_options_{start,end}. + parse-opt: Export a non NORETURN usage dumper. + parse-opt: create parse_options_step. + parse-opt: do not print errors on unknown options, return -2 intead. + parse-opt: fake short strings for callers to believe in. + parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option. + revisions: split handle_revision_opt() from setup_revisions() + git-blame: migrate to incremental parse-option [1/2] + git-blame: migrate to incremental parse-option [2/2] + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag + git-blame: fix lapsus + git-shortlog: migrate to parse-options partially. + revisions: refactor handle_revision_opt into parse_revision_opt. + +Pieter de Bie (1): + builtin-fast-export: Add importing and exporting of revision marks + +Rafael Garcia-Suarez (1): + gitweb: remove git_blame and rename git_blame2 to git_blame + +Ramsay Allan Jones (4): + Fix some warnings (on cygwin) to allow -Werror + t9113-*.sh: provide user feedback when test skipped + t9100-git-svn-basic.sh: Fix determination of utf-8 locale + git-request-pull: replace call to deprecated peek-remote + +René Scharfe (9): + Teach new attribute 'export-ignore' to git-archive + archive: remove args member from struct archiver + add context pointer to read_tree_recursive() + archive: add baselen member to struct archiver_args + archive: centralize archive entry writing + archive: unify file attribute handling + archive: remove extra arguments parsing code + archive: make zip compression level independent from core git + archive: remove unused headers + +Richard Quirk (1): + git-gui: Fix accidental staged state toggle when clicking top pixel row + +Robert Shearman (1): + git-send-email: Fix authenticating on some servers when using TLS. + +SZEDER Gábor (1): + stash: introduce 'stash save --keep-index' option + +Shawn O. Pearce (2): + Correct documentation for git-push --mirror + bash completion: Remove dashed command completion support + +Soeren Finster (1): + git-gui: Exit shortcut in MacOSX repaired + +Steffen Prohaska (5): + Windows: Fix ntohl() related warnings about printf formatting + compat/pread.c: Add a forward declaration to fix a warning + Move code interpreting path relative to exec-dir to new function system_path() + help.c: Add support for htmldir relative to git_exec_path() + help (Windows): Display HTML in default browser using Windows' shell API + +Stephan Beyer (10): + api-builtin.txt: update and fix typo + t3404: stricter tests for git-rebase--interactive + rerere: Separate libgit and builtin functions + t/test-lib.sh: exit with small negagive int is ok with test_must_fail + t/: Use "test_must_fail git" instead of "! git" + Make usage strings dash-less + git-am/git-mailsplit: correct synopsis for reading from stdin + t3404: test two "preserve merges with -p" cases + Make rebase--interactive use OPTIONS_SPEC + Link git-shell only to a subset of libgit.a + +SungHyun Nam (1): + t/Makefile: use specified shell when running aggregation script + +Sverre Hvammen Johansen (1): + reduce_heads(): thinkofix + +Sverre Rabbelier (2): + Modify test-lib.sh to output stats to t/test-results/* + Hook up the result aggregation in the test makefile. + +Ted Percival (1): + Don't use dash commands (git-foo) in tutorial-2 + +Teemu Likonen (3): + bash: Add more option completions for 'git log' + Add target "install-html" the the top level Makefile + bash: Add long option completion for 'git send-email' + +Thomas Rast (7): + git-send-email: add support for TLS via Net::SMTP::SSL + git-send-email: prevent undefined variable warnings if no encryption is set + git-add--interactive: replace hunk recounting with apply --recount + git-add--interactive: remove hunk coalescing + git-add--interactive: manual hunk editing mode + git-send-email: Do not attempt to STARTTLS more than once + Fix apply --recount handling of no-EOL line + + +Version v1.5.6.5; changes since v1.5.6.4: +----------------------------------------- + +Anders Melchiorsen (1): + Documentation: fix diff.external example + +Björn Steinbrink (1): + index-pack.c: correctly initialize appended objects + +Brandon Casey (1): + t/t4202-log.sh: add newline at end of file + +Ciaran McCreesh (1): + Make git-add -i accept ranges like 7- + +Jeff King (1): + init: handle empty "template" parameter + +Jim Meyering (1): + git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. + +Johannes Schindelin (1): + sort_in_topological_order(): avoid setting a commit flag + +Jonathan Nieder (2): + fix usage string for git grep + git-diff(1): "--c" -> "--cc" typo fix + +Junio C Hamano (12): + refresh-index: fix bitmask assignment + tests: propagate $(TAR) down from the toplevel Makefile + Makefile: fix shell quoting + make sure parsed wildcard refspec ends with slash + Documentation: clarify diff --cc + Update my e-mail address + Start 1.5.6.5 RelNotes to describe accumulated fixes + builtin-name-rev.c: split deeply nested part from the main function + RelNotes 1.5.6.5 updates + fix diff-tree --stdin documentation + Files given on the command line are relative to $cwd + GIT 1.5.6.5 + +Linus Torvalds (1): + diff.renamelimit is a basic diff configuration + +Mike Ralphson (1): + Documentation: typos / spelling fixes in older RelNotes + +Peter Valdemar Mørch (1): + send-email: find body-encoding correctly + +Pierre Habouzit (2): + git-checkout: fix command line parsing. + git-submodule: move ill placed shift. + +Pieter de Bie (1): + git-name-rev: allow --name-only in combination with --stdin + +René Scharfe (1): + git-name-rev: don't use printf without format + +Stephan Beyer (1): + builtin-revert.c: typofix + +Steve Haslam (1): + Propagate -u/--upload-pack option of "git clone" to transport. + + +Version v1.5.6.4; changes since v1.5.6.3: +----------------------------------------- + +Dmitry Potapov (3): + Fix buffer overflow in git-grep + Fix buffer overflow in git diff + Fix buffer overflow in prepare_attr_stack + +Johannes Schindelin (3): + git daemon: avoid calling syslog() from a signal handler + Add pretty format %aN which gives the author name, respecting .mailmap + git fetch-pack: do not complain about "no common commits" in an empty repo + +Johannes Sixt (1): + t7600-merge: Use test_expect_failure to test option parsing + +Junio C Hamano (4): + Start preparing 1.5.6.4 release notes + rev-list: honor --quiet option + http-fetch: do not SEGV after fetching a bad pack idx file + GIT 1.5.6.4 + +Lars Noschinski (1): + git-cvsserver: fix call to nonexistant cleanupWorkDir() + +Lukas Sandström (1): + git-mailinfo: Fix getting the subject from the in-body [PATCH] line + +Olivier Marin (1): + builtin-rm: fix index lock file path + +Petr Baudis (1): + Documentation/git-cherry-pick.txt et al.: Fix misleading -n description + +Shawn O. Pearce (9): + Correct pack memory leak causing git gc to try to exceed ulimit + bash completion: Improve responsiveness of git-log completion + bash completion: Don't offer "a.." as a completion for "a." + bash completion: Append space after file names have been completed + bash completion: Resolve git show ref:path losing ref: portion + index-pack: Refactor base arguments of resolve_delta into a struct + index-pack: Chain the struct base_data on the stack for traversal + index-pack: Track the object_entry that creates each base_data + index-pack: Honor core.deltaBaseCacheLimit when resolving deltas + +Stephan Beyer (2): + rebase-i: keep old parents when preserving merges + api-run-command.txt: typofix + + +Version v1.5.6.3; changes since v1.5.6.2: +----------------------------------------- + +Alex Riesen (1): + git-clone: remove leftover debugging fprintf(). + +Brian Hetro (5): + builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix' + convert.c: Use 'git_config_string' to get 'smudge' and 'clean' + diff.c: Use 'git_config_string' to get 'diff.external' + http.c: Use 'git_config_string' to clean up SSL config. + builtin-commit.c: Use 'git_config_string' to get 'commit.template' + +Christian Couder (1): + Fix "config_error_nonbool" used with value instead of key + +Gerrit Pape (1): + git-svn.perl: workaround assertions in svn library 1.5.0 + +Jeff King (1): + make deleting a missing ref more quiet + +Johannes Schindelin (1): + run_command(): respect GIT_TRACE + +Junio C Hamano (6): + attribute documentation: keep EXAMPLE at end + clone -q: honor "quiet" option over native transports. + mailinfo: feed the correct line length to decode_transfer_encoding() + Start preparing release notes for 1.5.6.3 + t0004: fix timing bug + GIT 1.5.6.3 + +Linus Torvalds (1): + racy-git: an empty blob has a fixed object name + +Lukas Sandström (1): + git-mailinfo: document the -n option + +Mark Levedahl (1): + git-submodule - Fix bugs in adding an existing repo as a module + +Matthew Ogilvie (1): + Documentation cvs: Clarify when a bare repository is needed + +Mikael Magnusson (1): + Fix grammar in git-rev-parse(1). + +Nikolaus Schulz (1): + Documentation: be precise about which date --pretty uses + +Petr Baudis (1): + Fix backwards-incompatible handling of core.sharedRepository + +SZEDER Gábor (1): + bash: offer only paths after '--' + +Shawn O. Pearce (1): + Remove unnecessary pack-*.keep file after successful git-clone + +Stephan Beyer (1): + git-am: Do not exit silently if committer is unset + + +Version v1.5.6.2; changes since v1.5.6.1: +----------------------------------------- + +Avery Pennarun (1): + git-svn: avoid filling up the disk with temp files. + +Björn Steinbrink (1): + git cat-file: Fix memory leak in batch mode + +Eric Wong (1): + git-svn: don't sanitize remote names in config + +Jeff King (3): + fetch: report local storage errors in status table + doc/rev-parse: clarify reflog vs --until for specifying revisions + fetch: give a hint to the user when local refs fail to update + +Jochen Voss (1): + avoid off-by-one error in run_upload_archive + +Joey Hess (1): + fix git config example syntax + +Johannes Schindelin (2): + clone: respect url.insteadOf setting in global configs + clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig + +Junio C Hamano (9): + Allow "git-reset path" when unambiguous + diff --check: do not discard error status upon seeing a good line + git-shell: accept "git foo" form + GIT 1.5.4.6 + GIT 1.5.5.5 + Start draft release notes for 1.5.6.2 + Work around gcc warnings from curl headers + Fix executable bits in t/ scripts + GIT 1.5.6.2 + +Shawn O. Pearce (1): + Fix describe --tags --long so it does not segfault + +Thomas Rast (1): + Fix 'git show' on signed tag of signed tag of commit + + +Version v1.5.6.1; changes since v1.5.6: +--------------------------------------- + +Brandon Casey (2): + git-merge.sh: fix typo in usage message: sucesses --> succeeds + t7502-commit.sh: test_must_fail doesn't work with inline environment variables + +Dan McGee (1): + completion: add --graph to log command completion + +Dmitry Potapov (1): + fix update-hook-example to work with packed tag references + +Jan Krüger (2): + Documentation: fix formatting in git-svn + git-svn: make rebuild respect rewriteRoot option + +Jeff King (2): + for-each-ref: implement missing tag values + clone: create intermediate directories of destination repo + +Junio C Hamano (2): + diff -c/--cc: do not include uninteresting deletion before leading context + GIT 1.5.6.1 + +Linus Torvalds (1): + Make git_dir a path relative to work_tree in setup_work_tree() + +Michele Ballabio (1): + parse-options.c: fix documentation syntax of optional arguments + +Patrick Higgins (1): + Workaround for AIX mkstemp() + +Stephan Beyer (4): + git-rebase.sh: Add check if rebase is in progress + api-builtin.txt: update and fix typo + api-parse-options.txt: Introduce documentation for parse options API + Extend parse-options test suite + + +Version v1.5.6; changes since v1.5.6-rc3: +----------------------------------------- + +Alejandro Mery (1): + git-am: head -1 is obsolete and doesn't work on some new systems + +Christian Couder (1): + Documentation: RelNotes-1.5.6: talk about renamed HTML files + +Jeff King (1): + clean up error conventions of remote.c:match_explicit + +Johan Herland (3): + cpio is no longer used by git-clone + Consistency: Use "libcurl" instead of "cURL library" and "curl" + The "curl" executable is no longer required + +Junio C Hamano (7): + Makefile: update check-docs target + Update RPM spec to drop curl executable requirement + diff.c: fix emit_line() again not to add extra line + create_tempfile: make sure that leading directories can be accessible by peers + sha1_file.c: simplify parse_pack_index() + builtin-rerere: fix a small leak + GIT 1.5.6 + +Lea Wiemann (2): + gitweb: quote commands properly when calling the shell + gitweb: remove unused parse_ref method + +Linus Torvalds (1): + write_loose_object: don't bother trying to read an old object + +Miklos Vajna (2): + run-command documentation: fix "memset()" parameter + path-list documentation: document all functions and data structures + +Olivier Marin (1): + Fix approxidate("never") to always return 0 + +Pierre Habouzit (1): + Make git reflog expire honour core.sharedRepository. + +SZEDER Gábor (1): + diff: reset color before printing newline + + +Version v1.5.6-rc3; changes since v1.5.6-rc2: +--------------------------------------------- + +Ask Bjørn Hansen (2): + gitweb setup instruction: rewrite HEAD and root as well + send-email: Allow the envelope sender to be set via configuration + +Avery Pennarun (2): + git-svn: don't append extra newlines at the end of commit messages. + git-svn: test that extra blank lines aren't inserted in commit messages. + +Boyd Lynn Gerber (2): + progress.c: avoid use of dynamic-sized array + Port to 12 other Platforms. + +Chris Ridd (1): + Improve sed portability + +Christian Couder (1): + documentation: bisect: remove bits talking about a bisection branch + +Flavio Poletti (1): + git-instaweb: improve auto-discovery of httpd and call conventions. + +Fred Maranhão (1): + fix typo in tutorial + +Geoffrey Irving (1): + doc: adding gitman.info and *.texi to .gitignore + +Jakub Narebski (2): + gitweb: Make it work with $GIT containing spaces + Use 'trash directory' thoroughly in t/test-lib.sh + +Jeff King (1): + document --pretty=tformat: option + +Johannes Schindelin (1): + merge-recursive: respect core.autocrlf when writing out the result + +Johannes Sixt (2): + make_nonrelative_path: Use is_absolute_path() + Remove exec bit from builtin-fast-export.c + +Junio C Hamano (8): + http-push.c: remove duplicated code + "remote prune": be quiet when there is nothing to prune + Documentation/git-pull.txt: Use more standard [NOTE] markup + Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output + user-manual: describe how higher stages are set during a merge + t4126: fix test that happened to work due to timing + sha1_file.c: dead code removal + GIT 1.5.6-rc3 + +Lea Wiemann (4): + t1006-cat-file.sh: typo + cat-file --batch / --batch-check: do not exit if hashes are missing + Documentation/git-cat-file.txt: add missing line break + t/.gitattributes: only ignore whitespace errors in test files + +Linus Torvalds (4): + Consolidate SHA1 object file close + Avoid cross-directory renames and linking on object creation + Make loose object file reading more careful + Simplify and rename find_sha1_file() + +Marius Storm-Olsen (1): + Add testcase for merging in a CRLF repo + +Mark Levedahl (1): + git-submodule - Fix errors regarding resolve_relative_url + +Mikael Magnusson (1): + Typo in RelNotes. + +Mike Hommey (1): + Don't allocate too much memory in quote_ref_url + +Miklos Vajna (3): + Remove unused code in parse_commit_buffer() + git-rebase -i: mention the short command aliases in the todo list + git-read-tree: document -v option. + +Olivier Marin (4): + remote show: fix the -n option + builtin-remote: split show_or_prune() in two separate functions + remote prune: print the list of pruned branches + remote show: list tracked remote branches with -n + +Paul Mackerras (1): + gitk: Handle detached heads better + +Philippe Bruhat (1): + git-cvsimport: do not fail when CVSROOT is / + +Pieter de Bie (1): + git-send-email: allow whitespace in addressee list + +René Scharfe (1): + Ignore .gitattributes in bare repositories + +SZEDER Gábor (2): + git add: add long equivalents of '-u' and '-f' options + completion: add more 'git add' options + +Shawn O. Pearce (1): + fast-export: Correctly generate initial commits with no parents + +Stephan Beyer (6): + git-commit.txt: Correct option alternatives + git-commit.txt: Add missing long/short options + Docs: Use "-l::\n--long\n" format in OPTIONS sections + Docs: add some long/short options + git-describe.txt: document --always + git-name-rev.txt: document --no-undefined and --always + + +Version v1.5.6-rc2; changes since v1.5.6-rc1: +--------------------------------------------- + +Adam Simpkins (2): + graph API: fix "git log --graph --first-parent" + git log --graph: print '*' for all commits, including merges + +Alex Riesen (1): + Fix t5516 on cygwin: it does not like double slashes at the beginning of a path + +Björn Steinbrink (1): + name-rev: Fix segmentation fault when using --all + +Christian Couder (2): + documentation: convert "diffcore" and "repository-layout" to man pages + documentation: move git(7) to git(1) + +Daniel Barkalow (1): + Use nonrelative paths instead of absolute paths for cloned repositories + +Dirk Süsserott (1): + Documentation/git-mailsplit: Enhanced description of -o option + +Jakub Narebski (1): + gitweb: Add charset info to "raw" output of 'text/plain' blobs + +Jeff King (1): + Fix "git clone http://$URL" to check out the worktree when asked + +Junio C Hamano (6): + t7502: do not globally unset GIT_COMMITTER_* environment variables + t7502: tighten loosely written test sequence + Documentation: git-log cannot use rev-list specific options + t7502: honor SHELL_PATH + GIT 1.5.5.4 + GIT 1.5.6-rc2 + +Lea Wiemann (2): + cat-file --batch: flush stdout also when objects are missing + git-for-each-ref.txt: minor improvements + +Michael Dressel (1): + describe: match pattern for lightweight tags too + +Miklos Vajna (1): + Strbuf documentation: document most functions + +Teemu Likonen (1): + Print info about "git help COMMAND" on git's main usage pages + + +Version v1.5.6-rc1; changes since v1.5.6-rc0: +--------------------------------------------- + +Adam Simpkins (2): + graph API: improve display of merge commits + graph API: avoid printing unnecessary padding before some octopus merges + +Christian Couder (2): + bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting + Documentation: convert "glossary" and "core-tutorial" to man pages + +Christian Engwer (1): + git-svn fails in prop_walk if $self->{path} is not empty + +Dmitry V. Levin (1): + builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value + +Gerrit Pape (2): + Documentation/git-bundle.txt: fix synopsis + commit --interactive: properly update the index before commiting + +Jakub Narebski (2): + gitweb: Remove gitweb/test/ directory + gitweb: Fix "next" link on bottom of page + +Jamis Buck (1): + git-reset: honor -q and do not show progress message + +Jeff King (1): + clone: make sure we support the transport type + +Johannes Schindelin (1): + hg-to-git: add --verbose option + +Johannes Sixt (3): + t5700-clone-reference: Quote $U + Revert "filter-branch: subdirectory filter needs --full-history" + rebase --interactive: Compute upstream SHA1 before switching branches + +John J. Franey (1): + Clarify description of argument to pull/fetch for naming remotes. + +Junio C Hamano (25): + tests: do not use implicit "git diff --no-index" + diff-files: do not play --no-index games + "git diff": do not ignore index without --no-index + Update draft release notes for 1.5.6 + log --graph: do not accept log --graphbogus + log --pretty: do not accept bogus "--prettyshort" + Release Notes for 1.5.5.2 + Documentation/git.txt: link to 1.5.5.2 documentation. + Makefile: fix dependency on wt-status.h + show-branch --current: do not barf on detached HEAD + git-diff: allow --no-index semantics a bit more + git diff --no-index: default to page like other diff frontends + GIT 1.5.5.3 + t5100: Avoid filename "nul" + Git::cat_blob: allow using an empty blob to fix git-svn breakage + fix sha1_pack_index_name() + Manual subsection to refer to other pages is SEE ALSO + Documentation: git-cherry uses git-patch-id + "git checkout -- paths..." should error out when paths cannot be written + checkout: make reset_clean_to_new() not die by itself + checkout: consolidate reset_{to_new,clean_to_new}() + unpack_trees(): allow callers to differentiate worktree errors from merge errors + checkout: "best effort" checkout + commit: drop duplicated parents + GIT v1.5.6-rc1 + +Karl Hasselström (3): + Add some tests for git update-ref -d + Fix path duplication in git svn commit-diff + Revert "git.el: Set process-environment instead of invoking env" + +Kevin Ballard (1): + Documentation/git-filter-branch.txt: Fix description of --commit-filter + +Lea Wiemann (5): + gitweb: only display "next" links in logs if there is a next page + t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons + Git.pm: fix documentation of hash_object + glossary: improve a few links + Git.pm: fix return value of config method + +Linus Torvalds (2): + Make pack creation always fsync() the result + Remove now unnecessary 'sync()' calls + +Luciano Rocha (1): + git-init: accept --bare option + +Marius Storm-Olsen (2): + Clearify the documentation for core.ignoreStat + Add shortcut in refresh_cache_ent() for marked entries. + +Michele Ballabio (1): + Documentation: fix graph in git-rev-parse.txt + +Miklos Vajna (1): + Revision walking documentation: document most important functions + +Nicolas Pitre (1): + make verify-pack a bit more useful with bad packs + +Paolo Bonzini (1): + rollback lock files on more signals than just SIGINT + +Pieter de Bie (1): + builtin-fast-export: Only output a single parent per line + +Seth Falcon (1): + Add a --dry-run option to git-svn rebase + +Shawn O. Pearce (8): + git-gui: Add a --trace command line option + git-gui: Handle workdir detection when CYGWIN=nowinsymlinks + Don't diff empty tree on branch creation in paranoid update hook + Don't load missing ACL files in paranoid update hook + Ignore no-op changes in paranoid update hook + Remove unused remote_prefix member in builtin-remote + Make "git-remote prune" delete refs according to fetch specs + Make "git-remote rm" delete refs acccording to fetch specs + +Stephan Beyer (2): + Add test cases for git-am + Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh + +Twiinz (1): + git-gui: Vertically align textboxes with labels + + +Version v1.5.6-rc0; changes since v1.5.5.4: +------------------------------------------- + +Adam Roben (11): + Add tests for git cat-file + git-cat-file: Small refactor of cmd_cat_file + git-cat-file: Make option parsing a little more flexible + git-cat-file: Add --batch-check option + git-cat-file: Add --batch option + Move git-hash-object tests from t5303 to t1007 + Add more tests for git hash-object + git-hash-object: Add --stdin-paths option + Git.pm: Add command_bidi_pipe and command_close_bidi_pipe + Git.pm: Add hash_and_insert_object and cat_blob + git-svn: Speed up fetch + +Adam Simpkins (11): + Remove dead code: show_log() sep argument and diff_options.msg_sep + log: print log entry terminator even if the message is empty + revision API: split parent rewriting and parent printing options + Add history graph API + log and rev-list: add --graph option + graph API: eliminate unnecessary indentation + graph API: fix graph mis-alignment after uninteresting commits + graph API: don't print branch lines for uninteresting merge parents + log --graph --left-right: show left/right information in place of '*' + Fix output of "git log --graph --boundary" + get_revision(): honor the topo_order flag for boundary commits + +Alex Riesen (10): + Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh + Improve reporting of errors in config file routines + Make the exit code of add_file_to_index actually useful + Extend interface of add_files_to_cache to allow ignore indexing errors + Add --ignore-errors to git-add to allow it to skip files with read errors + Add a test for git-add --ignore-errors + Add a config option to ignore errors for git-add + Ensure that a test is run in the trash directory + Fix t6031 on filesystems without working exec bit + Fix t3701 if core.filemode disabled + +Anders Waldenborg (1): + gitweb: Convert string to internal form before chopping in chop_str + +Avery Pennarun (3): + git-svn: add documentation for --use-log-author option. + git-svn: Add --add-author-from option. + git-svn: add documentation for --add-author-from option. + +Bart Trojanowski (1): + make git-status use a pager + +Brandon Casey (7): + filter-branch.sh: support nearly proper tag name filtering + compat/fopen.c: avoid clobbering the system defined fopen macro + repack: modify behavior of -A option to leave unreferenced objects unpacked + git-gc: always use -A when manually repacking + builtin-gc.c: deprecate --prune, it now really has no effect + builtin-clone.c: Need to closedir() in copy_or_link_directory() + t/Makefile: "trash" directory was renamed recently + +Bryan Donlan (10): + git-rebase.sh: Fix --merge --abort failures when path contains whitespace + config.c: Escape backslashes in section names properly + git-send-email.perl: Handle shell metacharacters in $EDITOR properly + test-lib.sh: Add a test_set_editor function to safely set $VISUAL + Use test_set_editor in t9001-send-email.sh + test-lib.sh: Fix some missing path quoting + lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters + Don't use the 'export NAME=value' in the test scripts. + Fix tests breaking when checkout path contains shell metacharacters + Rename the test trash directory to contain spaces. + +Caio Marcelo de Oliveira Filho (1): + git-format-patch: add --no-binary to omit binary changes in the patch. + +Chris Frey (2): + Documentation/git-prune.txt: document unpacked logic + Documentation/git-repack.txt: document new -A behaviour + +Chris Parsons (1): + Updated status to show 'Not currently on any branch' in red + +Christian Couder (21): + bisect: add "git bisect help" subcommand to get a long usage string + help: use man viewer path from "man..path" config var + documentation: help: add "man..path" config variable + help: use "man..cmd" as custom man viewer command + documentation: help: add info about "man..cmd" config var + documentation: web--browse: add a note about konqueror + rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet" + rev-parse: fix --verify to error out when passed junk after a good rev + Documentation: hooks: fix missing verb in pre-applypatch description + Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page + Documentation: improve "add", "pull" and "format-patch" examples + Documentation: bisect: add a few "git bisect run" examples + rev-parse: add test script for "--verify" + rev-parse: fix using "--default" with "--verify" + rev-parse --verify: do not output anything on error + Documentation: rev-parse: add a few "--verify" and "--default" examples + bisect: add test cases to check that "git bisect start" is atomic + bisect: fix left over "BISECT_START" file when starting with junk rev + bisect: trap critical errors in "bisect_start" + bisect: use a detached HEAD to bisect + Documentation: convert tutorials to man pages + +Christian Stimming (3): + git-gui: Update German translation + gitk: Update German translation + gitk: German translation again updated + +Clemens Buchacher (2): + Reset the signal being handled + http-push: remove remote locks on exit signals + +Clifford Caoile (1): + git.el: Set process-environment instead of invoking env + +Dan McGee (3): + completion: allow 'git remote' subcommand completion + completion: remove use of dashed git commands + Allow cherry-pick (and revert) to add signoff line + +Daniel Barkalow (12): + Make walker.fetch_ref() take a struct ref. + Make ls-remote http://... list HEAD, like for git://... + Mark the list of refs to fetch as const + Add a lockfile function to append to a file + Add a library function to add an alternate to the alternates file + Have a constant extern refspec for "--tags" + Allow for having for_each_ref() list extra refs + Add a function to set a non-default work tree + Provide API access to init_db() + Build in clone + clone: fall back to copying if hardlinking fails + Test that --reference actually suppresses fetching referenced objects + +Dmitry Potapov (1): + git-init: autodetect core.ignorecase + +Dustin Sallings (2): + Allow tracking branches to set up rebase by default. + Allow tracking branches to set up rebase by default. + +Eric Wong (1): + git-svn: fix cloning of HTTP URLs with '+' in their path + +Frank Lichtenheld (4): + var: Don't require to be in a git repository. + Git.pm: Don't require a repository instance for config + Git.pm: Don't require repository instance for ident + send-email: Don't require to be called in a repository + +Gerrit Pape (3): + gitweb: fallback to system-wide config file if default config does not exist + gitweb: fallback to system-wide config file (fixup) + gitk: Makefile/install: force permissions when installing files and dirs + +Govind Salinas (1): + pretty.c: add %x00 format specifier. + +Gustaf Hendeby (6): + git-svn: Make create-ignore use git add -f + Documentation: Add create-ignore to git svn manual + Documentation/config.txt: Add git-gui options + Documentation: Add missing git svn commands + Documentation: Fix skipped section level + Make git add -n and git -u -n output consistent + +Heikki Orsila (7): + Make core.sharedRepository more generic + Document functions xmemdupz(), xread() and xwrite() + Die for an early EOF in a file reading loop + Make read_in_full() and write_in_full() consistent with xread() and xwrite() + Cleanup xread() loops to use read_in_full() + Add log.date config variable + Remove redundant code, eliminate one static variable + +Imran M Yousuf (1): + Use '-f' option to point to the .gitmodules file + +Jakub Narebski (1): + gitweb: Use feed link according to current view + +Jeff King (12): + add--interactive: ignore mode change in 'p'atch command + add--interactive: allow user to choose mode update + git-fetch: always show status of non-tracking-ref fetches + git-remote: show all remotes with "git remote show" + Documentation: point git-prune users to git-gc + add merge.renamelimit config option + bump rename limit defaults + diff: make "too many files" rename warning optional + fix bsd shell negation + t5000: tar portability fix + clone: bsd shell portability fix + filter-branch: fix variable export logic + +Johan Herland (2): + Add a test for another combination of --reference + Add test for cloning with "--reference" repo being a subset of source repo + +Johannes Schindelin (10): + Provide git_config with a callback-data parameter + builtin-clone: fix initial checkout + cvsexportcommit: chomp only removes trailing whitespace + diff options: Introduce --ignore-submodules + Teach update-index about --ignore-submodules + Ignore dirty submodule states during rebase and stash + cvsexportcommit: introduce -W for shared working trees (between Git and CVS) + submodule update: add convenience option --init + pull --rebase: exit early when the working directory is dirty + mailsplit and mailinfo: gracefully handle NUL characters + +Johannes Sixt (3): + builtin-commit.c: Remove a redundant assignment. + git-gui: Report less precise object estimates for database compression + compat-util: avoid macro redefinition warning + +Jon Loeliger (1): + Add otherwise missing --strict option to unpack-objects summary. + +Junio C Hamano (24): + Optimize rename detection for a huge diff + t5300: add test for "unpack-objects --strict" + unpack-objects: fix --strict handling + rebase [--onto O] A B: omit needless checkout + sha1-lookup: more memory efficient search in sorted list of SHA-1 + diff: make --dirstat binary-file safe + sha1-lookup: make selection of 'middle' less aggressive + log: teach "terminator" vs "separator" mode to "--pretty=format" + git_config_bool_or_int() + write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE + diff-files: mark an index entry we know is up-to-date as such + Fix git_config_bool_or_int + First batch of post 1.5.5 updates + diff: a submodule not checked out is not modified + diff-lib.c: rename check_work_tree_entity() + is_racy_timestamp(): do not check timestamp for gitlinks + git-svn: add test for --add-author-from and --use-log-author + builtin-apply: typofix + builtin-apply: accept patch to an empty file + builtin-apply: do not declare patch is creation when we do not know it + unpack-trees: allow Porcelain to give different error messages + "git-add -n -u" should not add but just report + mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths + mailsplit: minor clean-up in read_line_with_nul() + +Jörg Sommer (1): + post-merge: Add it's not executed if merge failed. + +Krzysztof Kowalczyk (1): + alloc_ref_from_str(): factor out a common pattern of alloc_ref from string + +Lars Hjemli (8): + Add platform-independent .git "symlink" + Teach resolve_gitlink_ref() about the .git file + Teach git-submodule.sh about the .git file + Teach GIT-VERSION-GEN about the .git file + git-branch: add support for --merged and --no-merged + git-branch.txt: compare --contains, --merged and --no-merged + Add tests for `branch --[no-]merged` + revision.c: really honor --first-parent + +Linus Torvalds (12): + Make unpack_trees_options bit flags actual bitfields + Move name hashing functions into a file of its own + Make "index_name_exists()" return the cache_entry it found + Make hash_name_lookup able to do case-independent lookups + Add 'core.ignorecase' option + Make branch merging aware of underlying case-insensitive filsystems + Make unpack-tree update removed files before any updated files + When adding files to the index, add support for case-independent matches + Make git-add behave more sensibly in a case-insensitive environment + Optimize match_pathspec() to avoid fnmatch() + Avoid some unnecessary lstat() calls + Optimize symlink/directory detection + +Liu Yubao (1): + Documentation on --git-dir and --work-tree + +Marcel Koeppen (2): + Replace in-place sed in t7502-commit + Fix prepare-commit-msg hook and replace in-place sed + +Mark Hills (1): + Be more careful with objects directory permissions on clone + +Martin Koegler (3): + unpack-objects: prevent writing of inconsistent objects + receive-pack: allow using --strict mode for unpacking objects + t5300: add test for "index-pack --strict" + +Matthew Ogilvie (3): + git-cvsserver: add mechanism for managing working tree and current directory + implement gitcvs.usecrlfattr + git-cvsserver: add ability to guess -kb from contents + +Matthias Kestenholz (1): + Use color.ui variable in scripts too + +Matthieu Moy (1): + git-svn: detect and fail gracefully when dcommitting to a void + +Michele Ballabio (4): + gitk: Disable "Reset %s branch to here" when on a detached head + gitk: Move es.po where it belongs + builtin-cat-file.c: use parse_options() + change quoting in test t1006-cat-file.sh + +Mike Ralphson (1): + Makefile: update the default build options for AIX + +Miklos Vajna (11): + git-gc --auto: add pre-auto-gc hook + Documentation/hooks: add pre-auto-gc hook + contrib/hooks: add an example pre-auto-gc hook + git checkout: add -t alias for --track + git-format-patch: add a new format.cc configuration variable + git-send-email: add a new sendemail.cc configuration variable + Add tests for sendemail.cc configuration variable + INSTALL: add a note about GNU interactive tools has been renamed + git-fast-import: rename cmd_*() functions to parse_*() + git-merge: exclude unnecessary options from OPTIONS_SPEC + CodingGuidelines: Add a note to avoid assignments inside if() + +Nicolas Pitre (9): + pack-objects: small cleanup + pack-objects: remove some double negative logic + pack-objects: simplify the condition associated with --all-progress + pack-objects: clean up write_object() a bit + pack-objects: move compression code in a separate function + pack-objects: allow for early delta deflating + pack-objects: fix early eviction for max depth delta objects + add a force_object_loose() function + let pack-objects do the writing of unreachable objects as loose objects + +Paolo Bonzini (2): + Add a remote.*.mirror configuration option + add special "matching refs" refspec + +Paul Mackerras (40): + gitk: Use git log without --topo-order and reorganize the commits ourselves + gitk: Fix bug in assigning row numbers to arcs + gitk: Fix bug in parsing multiple revision arguments + gitk: Compute row numbers and order tokens lazily + gitk: Fix a couple of bugs + gitk: Fix more bugs resulting in Tcl "no such element in array" errors + gitk: More bug fixes and cleanups + gitk: Implement date mode in the new framework + gitk: Fix another collection of bugs + gitk: Don't try to show local changes from a head that isn't shown + gitk: Keep the same commits visible as other commits come in + gitk: Fix some corner cases in the targetid/targetrow stuff + gitk: Fix a couple of bugs in the find function + gitk: Fix potential bug with fake commit IDs in renumbervarc + gitk: Index [fnvr]highlights by id rather than row + gitk: Fix handling of flag arguments + gitk: Fix a bug in make_disporder + gitk: Select head of current branch by default + gitk: Select something appropriate on cherry-pick, branch reset and checkout + gitk: Fix bug where editing an existing view would cause an infinite loop + gitk: Fix bug causing Tcl error when no commits are selected + gitk: Fix cherry-picking to insert a real row not a fake row + gitk: Cope better with getting commits that we have already seen + gitk: Fix bug where arcs could get lost + gitk: Handle updating with path limiting better + gitk: Fix problems with target row stuff + gitk: Don't filter view arguments through git rev-parse + gitk: Correct a few strings and comments to say "git log" + gitk: Fix some corner cases in computing vrowmod and displayorder + gitk: Avoid a crash in selectline if commitinfo($id) isn't set + gitk: Fix problem with target row not being in scroll region + gitk: Reorganize processing of arguments for git log + gitk: Fix handling of tree file list with special chars in names + gitk: Make updates go faster + gitk: Synchronize highlighting in file view for 'f' and 'b' commands + gitk: Show current row number and total number of rows + gitk: Add a progress bar for checking out a head + gitk: Fix "wrong # coordinates" error on reload + gitk: Fix bug where current row number display stops working + gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" + +Paul Oliver (1): + Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them. + +Peter Karlsson (1): + gitk: Initial Swedish translation. + +Ping Yin (5): + git-submodule summary: --for-status option + builtin-status: submodule summary support + builtin-status: Add tests for submodule summary + t4027: test diff for submodule with empty directory + Add t7506 to test submodule related functions for git-status + +Rafael Garcia-Suarez (1): + Spelling fixes in the gitweb documentation + +Richard Quirk (2): + bash: Add completion for gitk --merge + Documentation gitk: Describe what --merge does + +SZEDER Gábor (5): + doc: moved merge.* config variables into separate merge-config.txt + merge, pull: introduce '--(no-)stat' option + add 'merge.stat' config variable + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable + merge, pull: add '--(no-)log' command line option + +Santi Béjar (3): + Preparation to call determine_author_info from prepare_to_commit + commit: Show author if different from committer + commit: Show committer if automatic + +Santiago Gala (1): + gitk: Spanish translation of gitk + +Sebastian Schuberth (1): + mergetool: Make ECMerge use the settings as specified by the user in the GUI + +Shawn O. Pearce (3): + git-gui: Don't use '$$cr master' with aspell earlier than 0.60 + git-gui: Setup branch.remote,merge for shorthand git-pull + git-gui: Delete branches with 'git branch -D' to clear config + +Steffen Prohaska (4): + t0050: Test autodetect core.ignorecase + t0050: Set core.ignorecase case to activate case insensitivity + t0050: Add test for case insensitive add + t0050: Fix merge test on case sensitive file systems + +Stephan Beyer (1): + builtin-apply.c: use git_config_string() to get apply_default_whitespace + +Stephen R. van den Berg (2): + Simplify and fix --first-parent implementation + git-svn: Same default as cvsimport when using --use-log-author + +Steven Grimm (1): + Add svn-compatible "blame" output format to git-svn + +Teemu Likonen (1): + Documentation/git-web--browse.txt: fix small typo + +Thomas Arcila (1): + gitk: Allow users to view diffs in external diff viewer + +Trent Piepho (1): + cvsexportcommit: Create config option for CVS dir + + +Version v1.5.5.4; changes since v1.5.5.3: +----------------------------------------- + +Björn Steinbrink (1): + name-rev: Fix segmentation fault when using --all + +Junio C Hamano (1): + GIT 1.5.5.4 + +Lea Wiemann (1): + git-for-each-ref.txt: minor improvements + +Michael Dressel (1): + describe: match pattern for lightweight tags too + + +Version v1.5.5.3; changes since v1.5.5.2: +----------------------------------------- + +Christian Couder (1): + bisect: print an error message when "git rev-list --bisect-vars" fails + +Gerrit Pape (3): + git-bisect.sh: don't accidentally override existing branch "bisect" + Documentation/git-bundle.txt: fix synopsis + commit --interactive: properly update the index before commiting + +Horst H. von Brand (1): + Fix recipient santitization + +Jeff King (2): + send-email: specify content-type of --compose body + send-email: rfc2047-quote subject lines with non-ascii characters + +Johannes Sixt (1): + Revert "filter-branch: subdirectory filter needs --full-history" + +Junio C Hamano (3): + Release Notes for 1.5.5.2 + show-branch --current: do not barf on detached HEAD + GIT 1.5.5.3 + +Lea Wiemann (1): + gitweb: only display "next" links in logs if there is a next page + +Michele Ballabio (1): + Documentation: fix graph in git-rev-parse.txt + +Pieter de Bie (1): + builtin-fast-export: Only output a single parent per line + + +Version v1.5.5.2; changes since v1.5.5.1: +----------------------------------------- + +A Large Angry SCM (1): + git-repack: re-enable parsing of -n command line option + +Alex Riesen (2): + Use "=" instead of "==" in condition as it is more portable + Fix use after free() in builtin-fetch + +Andy Parkins (1): + post-receive-email: fix accidental removal of a trailing space in signature line + +Ariel Badichi (2): + copy.c: copy_fd - correctly report write errors + archive.c: format_subst - fixed bogus argument to memchr + +Brandon Casey (1): + git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc + +Dan McGee (1): + Remove 'header' from --signoff option description + +Dmitry Potapov (1): + git-gc --prune is deprecated + +Dustin Sallings (1): + Documentation/config.txt: Mention branch..rebase applies to "git pull" + +Florian Ragwitz (1): + filter-branch: Documentation fix. + +Gerrit Pape (1): + diff-options.txt: document the new "--dirstat" option + +Heikki Orsila (1): + Add missing "short" alternative to --date in rev-list-options.txt + +Ian Hilt (1): + Documentation/git-describe.txt: make description more readable + +Jeff King (11): + Don't force imap.host to be set when imap.tunnel is set + t5516: remove ambiguity test (1) + doc/git-gc: add a note about what is collected + push: allow unqualified dest refspecs to DWIM + remote: create fetch config lines with '+' + fix reflog approxidate parsing bug + cvsimport: always pass user data to "system" as a list + checkout: don't rfc2047-encode oneline on detached HEAD + doc: clarify definition of "update" for git-add -u + doc/git-daemon: s/uploadarchive/uploadarch/ + git-am: fix typo in usage message + +Johannes Sixt (2): + wt-status.h: declare global variables as extern + rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref + +Jon Loeliger (2): + git-filter-branch: Clarify file removal example. + git-show.txt: Not very stubby these days. + +Junio C Hamano (3): + write-tree: properly detect failure to write tree objects + clone: detect and fail on excess parameters + fetch-pack: brown paper bag fix + +Linus Torvalds (1): + fetch-pack: do not stop traversing an already parsed commit + +Matt Graham (1): + Linked glossary from cvs-migration page + +Matthew Ogilvie (1): + gitattributes: Fix subdirectory attributes specified from root directory + +Michael Weber (1): + svn-git: Use binmode for reading/writing binary rev maps + +Miklos Vajna (1): + diff options documentation: refer to --diff-filter in --name-status + +Sam Vilain (1): + Amend git-push refspec documentation + +Shawn O. Pearce (1): + Clarify repack -n documentation + +Sitaram Chamarty (1): + builtin-commit.c: add -u as short name for --untracked-files + +Teemu Likonen (1): + bash: Add completion for git diff --base --ours --theirs + +Thomas Guyot-Sionnest (1): + git-svn bug with blank commits and author file + +martin f. krafft (2): + Escape project name in regexp + Escape project names before creating pathinfo URLs + + +Version v1.5.5.1; changes since v1.5.5: +--------------------------------------- + +Alberto Bertogli (1): + builtin-apply: Show a more descriptive error on failure when opening a patch + +Björn Steinbrink (1): + Fix section about backdating tags in the git-tag docs + +Carlos Rica (2): + Fix documentation syntax of optional arguments in short options. + core-tutorial.txt: Fix showing the current behaviour. + +Christian Couder (4): + bisect: fix bad rev checking in "git bisect good" + bisect: report bad rev better + bisect: squelch "fatal: ref HEAD not a symref" misleading message + git-bisect: make "start", "good" and "skip" succeed or fail atomically + +Clifford Caoile (1): + Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) + +Daniel Barkalow (1): + Fix config key miscount in url.*.insteadOf + +Dirk Süsserott (1): + Documentation/git-request-pull: Fixed a typo ("send" -> "end") + +Jakub Narebski (1): + gitweb: Fix 'history' view for deleted files with history + +Jeff King (1): + git-fetch: fix status output when not storing tracking ref + +Johannes Sixt (1): + Document option --only of git commit + +Jon Loeliger (1): + Clarify and fix English in "git-rm" documentation + +Jonas Fonseca (1): + git-remote: reject adding remotes with invalid names + +Junio C Hamano (7): + Document -w option to shortlog + Documentation/git-submodule: typofix + t7401: squelch garbage output + rebase: do not munge commit log message + git-am: minor cleanup + am: POSIX portability fix + GIT 1.5.5.1 + +Linus Torvalds (2): + Ignore leading empty lines while summarizing merges + git-am: cope better with an empty Subject: line + +Mark Levedahl (1): + git-submodule - possibly use branch name to describe a module + +Matthieu Moy (1): + Document that WebDAV doesn't need git on the server, and works over SSL + +Michele Ballabio (1): + revision.c: make --date-order overriddable + +Pedro Melo (1): + Force the medium pretty format on calls to git log + +Ping Yin (1): + git-submodule: Avoid 'fatal: cannot describe' message + +René Scharfe (1): + git-archive: ignore prefix when checking file attribute + +Scott Collins (1): + Clarify documentation of git-cvsserver, particularly in relation to git-shell + +Shawn Bohrer (2): + git clean: Don't automatically remove directories when run within subdirectory + git clean: Add test to verify directories aren't removed with a prefix + + +Version v1.5.5; changes since v1.5.5-rc3: +----------------------------------------- + +Christian Couder (2): + git-gui: Update french translation + test suite: remove useless TERM cruft in "t7005-editor.sh" + +Eric Wong (1): + git-svn: fix following renamed paths when tracking a single path + +Gerrit Pape (1): + gitk: Fix changing colors through Edit->Preferences + +Jakub Narebski (1): + Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output" + +Junio C Hamano (2): + Fix "git apply" to correctly enforce "match at the beginning" + GIT 1.5.5 + +Kevin Ballard (1): + git-fetch: Don't trigger a bus error when given the refspec "tag" + +Michele Ballabio (1): + git-gui: use +/- instead of ]/[ to show more/less context in diff + +Pascal Obry (2): + Add interactive option in rebase command completion list. + Add prefix oriented completions for diff and format-patch commands. + +Peter Eriksen (2): + git-pack-objects.txt: Make wording slightly less ambiguous + Add description of OFS_DELTA to the pack format description + +Shawn O. Pearce (1): + git-gui: Switch keybindings for [ and ] to bracketleft and bracketright + + +Version v1.5.5-rc3; changes since v1.5.5-rc2: +--------------------------------------------- + +Brandon Casey (2): + mktag.c: improve verification of tagger field and tests + mktag.c: tweak validation of tagger field and adjust test script + +Bryan Donlan (1): + Silence cpio's "N blocks" output when cloning locally + +Christian Couder (1): + help: Add a missing OPT_END(). + +Damien Diederen (7): + cvsserver: Respond to the 'editors' and 'watchers' commands + cvsserver: Only print the file part of the filename in status header + cvsserver: Do not include status output for subdirectories if -l is passed + cvsserver: Add a few tests for 'status' command + cvsserver: Implement update -p (print to stdout) + cvsserver: Add test for update -p + cvsserver: Use the user part of the email in log and annotate results + +Eric Wong (1): + git-svn: remove redundant slashes from show-ignore + +Johannes Sixt (3): + filter-branch: Test renaming directories in a tree-filter + verify-tag: Clean up the temporary file if gpg cannot be started. + t7004-tag: Skip more tests if gpg is not available. + +Jonathan del Strother (1): + git-gui: Add shortcut keys for Show More/Less Context + +Josh Elsasser (1): + Allow git-cvsserver database table name prefix to be specified. + +Junio C Hamano (5): + Add corner case tests for diff-index and diff-files + diff-index: careful when inspecting work tree items + diff-files: careful when inspecting work tree items + Accept git aliases outside a git repository + GIT 1.5.5-rc3 + +Marius Storm-Olsen (1): + git-p4: Handle Windows EOLs properly after removal of p4 submit template handling. + +Paolo Bonzini (1): + git-cvsserver: handle change type T + +Shawn O. Pearce (1): + git-gui 0.10 + +Teemu Likonen (1): + Describe the bug in handling filenames with funny characters in 'git add -i' + +veillette@yahoo.ca (1): + filter-branch: Fix renaming a directory in the tree-filter + + +Version v1.5.5-rc2; changes since v1.5.5-rc1: +--------------------------------------------- + +Brandon Casey (1): + t/t3800-mktag.sh: use test_must_fail rather than '!' + +Daniel Barkalow (2): + Tighten refspec processing + Fix branches file configuration + +Dirk Süsserott (1): + Documentation: git-tag '-m'/'-F' implies '-a' + +Frank Lichtenheld (1): + t9600-cvsimport.sh: set HOME before checking for cvsps availability + +Gerrit Pape (1): + imap-send: properly error out if imap.host is not set in config + +Guanqun Lu (2): + Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. + Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. + +Jeff King (1): + Documentation: clarify use of .git{ignore,attributes} versus .git/info/* + +Johannes Schindelin (2): + RelNotes: mention checkout/branch's --track option, too + init: show "Reinit" message even in an (existing) empty repository + +Johannes Sixt (1): + builtin-remote: Fix missing newline at end of listing of pushed branches + +Julian Phillips (1): + Documentation/git-checkout: Update summary to reflect current abilities + +Junio C Hamano (7): + refspec: allow colon-less wildcard "refs/category/*" + git-fetch test: test tracking fetch results, not just FETCH_HEAD + test_must_fail: 129 is a valid error code from usage() + Update draft release notes for 1.5.4.5 + Update draft release notes for 1.5.5 + builtin-prune: protect objects listed on the command line + GIT 1.5.4.5 + +Michele Ballabio (3): + parse-options.c: introduce OPT_DATE + Add tests for git-prune + builtin-prune.c: use parse_options() + +SZEDER Gábor (1): + Always set *nongit_ok in setup_git_directory_gently() + + +Version v1.5.5-rc1; changes since v1.5.5-rc0: +--------------------------------------------- + +Brandon Casey (2): + builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto + t/t7003-filter-branch.sh: use test_must_fail rather than '!' + +Daniel Barkalow (3): + Tighten refspec processing + Fix t3200 config + Fix tag following + +Eyvind Bernhardsen (2): + fast-import: Allow "reset" to delete a new branch without error + fast-import: Document the effect of "merge" with no "from" in a commit + +Johannes Schindelin (1): + remote show: do not show symbolic refs + +Junio C Hamano (10): + Makefile: DIFF_OBJS is not special at all these days + Makefile: flatten enumeration of headers, objects and programs + t1000: use "test_must_fail git frotz", not "! git frotz" + git-merge-one-file: fix longstanding stupid thinko + Test: catch if trash cannot be removed + Add tests to catch problems with un-unlinkable symlinks + Fix read-tree not to discard errors + remote.c: Fix overtight refspec validation + gc --auto: raise default auto pack limit from 20 to 50 + GIT 1.5.5-rc1 + +Kevin Ballard (4): + Add --reverse to the git-rev-list usage string + Document the sendemail.smtpserverport config variable + Don't try and percent-escape existing percent escapes in git-svn URIs + Make git-svn tests behave better on OS X + +Linus Torvalds (3): + Don't update unchanged merge entries + Fix possible Solaris problem in 'checkout_entry()' + Make revision limiting more robust against occasional bad commit dates + +Marius Storm-Olsen (1): + git-p4: Optimize the fetching of data from perforce. + +Miklos Vajna (1): + Documentation/git-merge: document subtree strategy. + +Nicolas Pitre (1): + make it easier for people who just want to get rid of 'git gc --auto' + +Ralf Wildenhues (1): + Improve description of git filter-branch. + +Shawn Bohrer (2): + git-p4: Unset P4DIFF environment variable when using 'p4 -du diff' + git-p4: Use P4EDITOR environment variable when set + + +Version v1.5.5-rc0; changes since v1.5.4.5: +------------------------------------------- + +Adam Piątyszek (1): + git-gui: Add option for changing the width of the commit message text box + +Alex Riesen (4): + Fix builtin checkout crashing when given an invalid path + Fix test for cleanup failure in t7300 on Windows + Do not use GUID on dir in git init --shared=all on FreeBSD + git-gui: update russian translation + +Alexandre Julliard (5): + git.el: Support for showing unknown/ignored directories. + git.el: Added a command to amend a commit. + git.el: Check for existing buffers on revert. + git.el: Better handling of subprocess errors. + git.el: Do not display empty directories. + +Andreas Ericsson (1): + pack-objects: Add runtime detection of online CPU's + +Brandon Casey (13): + builtin-reflog.c: fix typo that accesses an unset variable + Add compat/fopen.c which returns NULL on attempt to open directory + builtin-reflog.c: don't install new reflog on write failure + reflog-delete: parse standard reflog options + git-reflog: add option --rewrite to update reflog entries while expiring + refs.c: make close_ref() and commit_ref() non-static + git-reflog: add option --updateref to write the last reflog sha1 into the ref + git-stash: add new 'drop' subcommand + git-stash: add new 'pop' subcommand + pack-objects: Print a message describing the number of threads for packing + t3903-stash.sh: Add missing '&&' to body of testcase + git-reflog.txt: Document new commands --updateref and --rewrite + t3903-stash.sh: Add tests for new stash commands drop and pop + +Brian Downing (1): + compat: Add simplified merge sort implementation from glibc + +Bruno Ribas (2): + gitweb: Make use of the $git_dir variable at sub git_get_project_url_list + gitweb: Use the config file to set repository owner's name. + +Carl Worth (1): + Eliminate confusing "won't bisect on seeked tree" failure + +Carlos Rica (1): + Make builtin-reset.c use parse_options. + +Charles Bailey (6): + Tidy up git mergetool's backup file behaviour + Changed an internal variable of mergetool to support custom commands + Teach git mergetool to use custom commands defined at config time + Add a very basic test script for git mergetool + git-mergetool documentaiton: show toolnames in typewriter font + merge-tool documentation: describe custom command usage + +Christian Couder (17): + help: make 'git-help--browse' usable outside 'git-help'. + help--browse: add '--config' option to check a config option for a browser. + Rename 'git-help--browse.sh' to 'git-web--browse.sh'. + instaweb: use 'git-web--browse' to launch browser. + config: add test cases for empty value and no value config variables. + Documentation: instaweb: add 'git-web--browse' information. + web--browse: Add a few quotes in 'init_browser_path'. + Documentation: add 'git-web--browse.txt' and simplify other docs. + help.c: use 'git_config_string' to get 'help_default_format'. + run-command: Redirect stderr to a pipe before redirecting stdout to stderr + help: add "man.viewer" config var to use "woman" or "konqueror" + Documentation: help: describe 'man.viewer' config variable + help: implement multi-valued "man.viewer" config option + Documentation: help: explain 'man.viewer' multiple values + help: warn if specified 'man.viewer' is unsupported, instead of erroring out + web--browse: use custom commands defined at config time + Documention: web--browse: add info about "browser..cmd" config var + +Christian Stimming (4): + git-gui: (i18n) Fix a bunch of still untranslated strings. + git-gui: Update German translation. + git-gui: (i18n) Add newly added translation strings to template. + git-gui: Update German translation. + +Clemens Buchacher (2): + http-push: push : deletes remote branch + http-push: add regression tests + +Daniel Barkalow (33): + Test :/string form for checkout + Reduce the number of connects when fetching + Allow callers of unpack_trees() to handle failure + Add flag to make unpack_trees() not print errors. + Send unpack-trees debugging output to stderr + Discard "deleted" cache entries after using them to update the working tree + Add "skip_unmerged" option to unpack_trees. + Build-in merge-recursive + Move create_branch into a library file + Use diff -u instead of diff in t7201 + Library function to check for unmerged index entries + Move code to clean up after a branch change to branch.c + Build in checkout + Clean up reporting differences on branch switch + API documentation for remote.h + Add more tests for format-patch + Improve message-id generation flow control for format-patch + Export some email and pretty-printing functions + Use ALLOC_GROW in remote.{c,h} + Add a --cover-letter option to format-patch + Add tests for extra headers in format-patch + Fix format.headers not ending with a newline + Combine To: and Cc: headers + Support a --cc= option in format-patch + Resolve value supplied for no-colon push refspecs + builtin-checkout.c: Remove unused prefix arguments in switch_branches path + Add support for url aliases in config files + Add API access to shortlog + Improve collection of information for format-patch --cover-letter + Always use the current connection's remote ref list in git protocol + Use diff_tree() directly in making cover letter + Write index file on any checkout of files + Write diff output to a file in struct diff_options + +David Aguilar (1): + gitk: Don't show local changes when we there is no work tree + +David Brown (1): + git-send-email: Generalize auto-cc recipient mechanism. + +David Kågedal (1): + git.el: Set process-environment instead of invoking env + +Denis Cheng (4): + cleanup: remove unused git_checkout_config + whatchanged documentation: share description of --pretty with others + specify explicit "--pretty=medium" with `git log/show/whatchanged` + log/show/whatchanged: introduce format.pretty configuration + +Dmitry Potapov (3): + git-web--browse: do not start the browser with nohup + Make private quote_path() in wt-status.c available as quote_path_relative() + git-clean: correct printing relative path + +Eric Wong (1): + git-svn: improve repository URL matching when following parents + +Florian La Roche (1): + gitweb: Make feed entries point to commitdiff view + +Frank Lichtenheld (1): + gc: Add --quiet option + +Gerrit Pape (4): + gitk: properly deal with tag names containing / (slash) + git-merge-index documentation: clarify synopsis + builtin-tag.c: remove cruft + hash-object: cleanup handling of command line options + +Jakub Narebski (11): + gitweb: Fix displaying unchopped argument in chop_and_escape_str + gitweb: Add new option -nohtml to quot_xxx subroutines + gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form + gitweb: Fix bugs in git_search_grep_body: it's length(), not len() + gitweb: Better cutting matched string and its context + Add '--fixed-strings' option to "git log --grep" and friends + gitweb: Change parse_commits signature to allow for multiple options + gitweb: Simplify fixed string search + Documentation: Remove --{min,max}-age option from git-log(1) + gitweb: Mark first match when searching commit messages + gitweb: Fix and simplify pickaxe search + +James Bowes (1): + Add a BuildRequires for gettext in the spec file. + +Jason McMullan (1): + Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import + +Jay Soffian (8): + git-web--browse: fix misplaced quote in init_browser_path() + git-help--browse: improve browser support under OS X + builtin-checkout.c: fix possible usage segfault + branch: optionally setup branch.*.merge from upstream local branches + doc: documentation update for the branch track changes + Correct git-pull documentation + send-email: fix In-Reply-To regression + pull: pass --strategy along to to rebase + +Jean-Luc Herren (1): + fast-import: exit with proper message if not a git dir + +Jeff King (31): + allow suppressing of global and system config + fix config reading in tests + hard-code the empty tree object + add--interactive: handle initial commit better + git_config_*: don't assume we are parsing a config file + t3404: use configured shell instead of /bin/sh + diff: fix java funcname pattern for solaris + t9001: enhance fake sendmail test harness + send-email: test compose functionality + help: use parseopt + make alias lookup a public, procedural function + help: respect aliases + use build-time SHELL_PATH in test scripts + rename: warn user when we have turned off rename detection + allow git-am to run in a subdirectory + Add a test for read-tree -u --reset with a D/F conflict + gitk: make autoselect optional + tr portability fixes + t0050: perl portability fix + more tr portability test script fixes + grep portability fix: don't use "-e" or "-q" + remove use of "tail -n 1" and "tail -1" + add test_cmp function for test scripts + t4020: don't use grep -a + t6000lib: tr portability fix + add NO_EXTERNAL_GREP build option + filter-branch: don't use xargs -0 + filter-branch: use $SHELL_PATH instead of 'sh' + t9112: add missing #!/bin/sh header + t7505: use SHELL_PATH in hook + t6000lib: re-fix tr portability + +Jim Meyering (1): + Avoid unnecessary "if-before-free" tests. + +Johan Herland (2): + Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR + Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR + +Johannes Schindelin (21): + Teach "git reflog" a subcommand to delete single entries + Also use unpack_trees() in do_diff_cache() + Fix "git clone" for git:// protocol + Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...) + Introduce the config variable pack.packSizeLimit + bisect view: check for MinGW32 and MacOSX in addition to X11 + xdl_merge(): make XDL_MERGE_ZEALOUS output simpler + xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM + completion: support format-patch's --cover-letter option + path-list: add functions to work with unsorted lists + parseopt: add flag to stop on first non option + Test "git remote show" and "git remote prune" + Make git-remote a builtin + builtin-remote: prune remotes correctly that were added with --mirror + Fix make_absolute_path() for parameters without a slash + format-patch: use the diff options for the cover letter, too + format-patch: wrap cover-letter's shortlog sensibly + remote show: Clean up connection correctly if object fetch wasn't done + remote: fix "update [group...]" + builtin remote rm: remove symbolic refs, too + gc: call "prune --expire 2.weeks.ago" by default + +Johannes Sixt (7): + Fix misuse of prefix_path() + gitk: Heed the lines of context in merge commits + Technical documentation of the run-command API. + prefix_path: use is_absolute_path() instead of *orig == '/' + start_command(), .in/.out/.err = -1: Callers must close the file descriptor + start_command(), if .in/.out > 0, closes file descriptors, not the callers + git-submodule summary: fix that some "wc" flavors produce leading spaces + +Jonas Fonseca (2): + man pages are littered with .ft C and others + shortlog: do not require to run from inside a git repository + +Junichi Uekawa (1): + git-blame.el: show the when, who and what in the minibuffer. + +Junio C Hamano (93): + index: be careful when handling long names + Avoid running lstat(2) on the same cache entry. + read-cache.c: fix a couple more CE_REMOVE conversion + read-cache.c: introduce is_racy_timestamp() helper + lazy index hashing + Sane use of test_expect_failure + test: reword the final message of tests with known breakages + known breakage: revision range computation with clock skew + fix misuse of prefix_path() + builtin-apply.c: refactor small part that matches context + builtin-apply.c: restructure "offset" matching + builtin-apply.c: push match-beginning/end logic down + builtin-apply.c: make it more line oriented + builtin-apply.c: optimize match_beginning/end processing a bit. + builtin-apply.c: mark common context lines in lineinfo structure. + builtin-apply.c: clean-up apply_one_fragment() + builtin-apply.c: simplify calling site to apply_line() + builtin-apply.c: do not feed copy_wsfix() leading '+' + builtin-apply.c: move copy_wsfix() function a bit higher. + builtin-apply.c: pass ws_rule down to match_fragment() + git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run + core.whitespace: cr-at-eol + Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header + Documentation/SubmittingPatches: discuss first then submit + Documentation/SubmittingPatches: What's Acked-by and Tested-by? + Make error messages from cherry-pick/revert more sensible + setup: sanitize absolute and funny paths in get_pathspec() + git-add: adjust to the get_pathspec() changes. + builtin-mv: minimum fix to avoid losing files + gitignore(5): Allow "foo/" in ignore list to match directory "foo" + gitignore: lazily find dtype + Define the project whitespace policy + apply: do not barf on patch with too large an offset + Update the main documentation (stale notes section) + .mailmap: adjust to a recent patch application glitch. + diff --relative: output paths as relative to the current subdirectory + diff --relative: help working in a bare repository + checkout: notice when the switched branch is behind or forked + Documentation/SubmittingPatches - a suggested patch flow + Sync with 1.5.4.2 and start 1.5.5 Release Notes + sending errors to stdout under $PAGER + merge-recursive: split low-level merge functions out. + expose a helper function peel_to_type(). + checkout: tone down the "forked status" diagnostic messages + checkout: work from a subdirectory + git-reset --hard and git-read-tree --reset: fix read_cache_unmerged() + checkout: updates to tracking report + gitweb: Better chopping in commit search results + Add merge-subtree back + checkout: show progress when checkout takes long time while switching branches + ws_fix_copy(): move the whitespace fixing function to ws.c + checkout: error out when index is unmerged even with -m + diff --dirstat: saner handling of binary and unmerged files + url rewriting: take longest and first match + git-apply --whitespace=fix: fix off by one thinko + Revert "pack-objects: Print a message describing the number of threads for packing" + git-remote: do not complain on multiple URLs for a remote + format-patch: remove a leftover debugging message + tests: introduce test_must_fail + Update draft release notes for 1.5.5 + t6024: move "git reset" to prepare for a test inside the test itself + CodingGuidelines: spell out how we use grep in our scripts + find_unique_abbrev(): redefine semantics + Clean up find_unique_abbrev() callers + diff-lib.c: constness strengthening + diff: make sure work tree side is shown as 0{40} when different + Update draft release notes for 1.5.5 + describe --always: fall back to showing an abbreviated object name + git-describe: use tags found in packed-refs correctly + describe: fix --long output + describe: re-fix display_name() + t6120 (describe): check --long properly + Revert "receive-pack: use strict mode for unpacking objects" + Revert "unpack-objects: prevent writing of inconsistent objects" + fsck.c: fix bogus "empty tree" check + am: read from the right mailbox when started from a subdirectory + am: remove support for -d .dotest + am: --rebasing + get_pathspec(): die when an out-of-tree path is given + Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files) + Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes) + Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec()) + git-clean: add tests for relative path + send-email: --no-signed-off-cc should suppress 'sob' cc + traverse_trees_recursive(): propagate merge errors up + git-gui: Simplify MSGFMT setting in Makefile + Documentation/config: typofix + Documentation/git-help: typofix + read-tree() and unpack_trees(): use consistent limit + Redo "add test_cmp function for test scripts" + git-gui: Improve directions regarding POT update in po/README + Resurrect git-rerere to contrib/examples + Update draft release notes for 1.5.5 + +Karl Hasselström (2): + git-svn: Don't call git-repack anymore + Let "git svn" run "git gc --auto" occasionally + +Kevin Ballard (1): + bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces + +Kristian Høgsberg (1): + wt-status.c: no need for dup() dance anymore + +Lars Hjemli (1): + Simplify setup of $GIT_DIR in git-sh-setup.sh + +Linus Torvalds (22): + Make on-disk index representation separate from in-core one + Make run_diff_index() use unpack_trees(), not read_tree() + Create pathname-based hash-table lookup into index + Add "--dirstat" for some directory statistics + gitk: learn --show-all output + Add "--show-all" revision walker flag for debugging + Fix name re-hashing semantics + Name hash fixups: export (and rename) remove_hash_entry + Use helper function for copying index entry information + Be more verbose when checkout takes a long time + Add 'df_name_compare()' helper function + Make 'traverse_tree()' use linked structure rather than 'const char *base' + Add return value to 'traverse_tree()' callback + Make 'traverse_trees()' traverse conflicting DF entries in parallel + Move 'unpack_trees()' over to 'traverse_trees()' interface + Fix tree-walking compare_entry() in the presense of --prefix + Add 'const' where appropriate to index handling functions + Make 'unpack_trees()' take the index to work on as an argument + Make 'unpack_trees()' have a separate source and destination index + unpack_trees(): minor memory leak fix in unused destination index + unpack_trees(): fix diff-index regression. + Fix recent 'unpack_trees()'-related changes breaking 'git stash' + +Marco Costalba (1): + Avoid a useless prefix lookup in strbuf_expand() + +Mark Levedahl (1): + git-submodule - Allow adding a submodule in-place + +Martin Koegler (28): + git-fsck: report missing author/commit line in a commit as an error + parse_object_buffer: don't ignore errors from the object specific parsing functions + deref_tag: handle return value NULL + deref_tag: handle tag->tagged = NULL + check return code of prepare_revision_walk + read_object_with_reference: don't read beyond the buffer + get_sha1_oneline: check return value of parse_object + mark_blob/tree_uninteresting: check for NULL + reachable.c::add_one_tree: handle NULL from lookup_tree + list-objects.c::process_tree/blob: check for NULL + check results of parse_commit in merge_bases + process_tag: handle tag->tagged == NULL + reachable.c::process_tree/blob: check for NULL + revision.c: handle tag->tagged == NULL + parse_commit: don't fail, if object is NULL + check return value from parse_commit() in various functions + peel_onion: handle NULL + add generic, type aware object chain walker + builtin-fsck: move away from object-refs to fsck_walk + Remove unused object-ref code + builtin-fsck: reports missing parent commits + builtin-fsck: move common object checking code to fsck.c + add common fsck error printing function + unpack-object: cache for non written objects + unpack-objects: prevent writing of inconsistent objects + index-pack: introduce checking mode + receive-pack: use strict mode for unpacking objects + fetch-pack: check parse_commit/object results + +Matthias Kestenholz (1): + Add color.ui variable which globally enables colorization if set + +Michael Witten (3): + git-send-email: ssh/login style password requests + git-send-email: SIG{TERM,INT} handlers + git-send-email: Better handling of EOF + +Michal Rokos (2): + Add compat/snprintf.c for systems that return bogus + autoconf: Test FREAD_READS_DIRECTORIES + +Michele Ballabio (7): + gitk: Fix "Key bindings" message + git-gui: fix typo in lib/spellcheck.tcl + builtin-for-each-ref.c: fix typo in error message + gitk: Mark another string for translation + git-gui: update Italian translation + gitk: initial Italian translation + git-gui: remove spurious "fuzzy" attributes in po/it.po + +Mike Hommey (5): + Work around curl-gnutls not liking to be reinitialized + Add test for git rebase --abort + Documentation/git-rebase.txt: Add --strategy to synopsys + git rebase --abort: always restore the right commit + t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge + +Miklos Vajna (4): + git-clean: handle errors if removing files fails + Improve t6029 to check the real "subtree" case + Update Hungarian translation. 100% completed. + git-gui: Updated Hungarian translation (e5fba18) + +Nanako Shiraishi (2): + git-gui: Update Japanese translation + git-gui: Update Japanese translation + +Nicolas Pitre (5): + factorize revindex code out of builtin-pack-objects.c + make verify_one_pack() a bit less wrong wrt packed_git structure + fix unimplemented packed_object_info_detail() features + add storage size output to 'git verify-pack -v' + pack-objects: proper pack time stamping with --max-pack-size + +Paolo Bonzini (4): + git-commit: support variable number of hook arguments + git-commit: set GIT_EDITOR=: if editor will not be launched + git-commit: Refactor creation of log message. + git-commit: add a prepare-commit-msg hook + +Paul Mackerras (3): + gitk: Only restore window size from ~/.gitk, not position + gitk: Avoid Tcl error when switching views + gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d + +Pekka Kaitaniemi (1): + gitk: Add horizontal scrollbar to the diff view + +Peter Karlsson (2): + git-gui: Regenerated po template and merged translations with it + git-gui: updated Swedish translation + +Petr Baudis (1): + gitweb: Clearly distinguish regexp / exact match searches + +Philipp A. Hartmann (1): + git-gui: if a background colour is set, set foreground colour as well + +Philippe Bruhat (3): + cvsimport: have default merge regex allow for dashes in the branch name + cvsimport: allow for multiple -M options + cvsimport: document that -M can be used multiple times + +Pierre Habouzit (4): + git-describe: Add a --match option to limit considered tags. + git-name-rev: add a --(no-)undefined option. + parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt + parse-options: new option type to treat an option-like parameter as an argument. + +Ping Yin (5): + git-submodule summary: code framework + git-submodule summary: show commit summary + git-submodule summary: limit summary size + git-submodule summary: documentation + git-submodule summary: test + +Rafael Garcia-Suarez (1): + Make git-remote.perl "use strict" compliant + +Ralf Wildenhues (1): + Fix doc typos. + +Robin Rosenberg (2): + Make blame accept absolute paths + Improve bash prompt to detect various states like an unfinished merge + +SZEDER Gábor (9): + bash: add git-branch options + bash: git-branch -d and -m lists only local branches + bash: remove unnecessary conditions when checking for subcommands + bash: refactor searching for subcommands on the command line + bash: add new 'git stash' subcommands + bash: add 'git svn' subcommands and options + bash: use __gitdir when completing 'git rebase' options + bash: fix long option with argument double completion + update 'git rebase' documentation + +Samuel Tardieu (1): + "remote update": print remote name being fetched from + +Santi Béjar (3): + git-bundle.txt: Add different strategies to create the bundle + git-describe: --long shows the object name even for a tagged commit + clone: support cloning full bundles + +Sebastian Noack (1): + git-svn: Don't prompt for client cert password everytime. + +Shawn O. Pearce (37): + git-gui: Automatically spell check commit messages as the user types + git-gui: Paper bag fix bad string length call in spellchecker + git-gui: Correct size of dictionary name widget in options dialog + Include annotated tags in fast-import crash reports + Include the fast-import marks table in crash reports + Finish current packfile during fast-import crash handler + Update fast-import documentation to discuss crash reports + Teach git-grep --name-only as synonym for -l + git-gui: Ensure all spellchecker 'class' variables are initialized + git-gui: Remove explicit references to 'aspell' in message strings + git-gui: Only bind the spellcheck popup suggestion hook once + git-gui: Catch and display aspell startup failures to the user + git-gui: Gracefully display non-aspell version errors to users + git-gui: Shorten Aspell version strings to just Aspell version number + Optimize peel_ref for the current ref of a for_each_ref callback + Teach git-describe to use peeled ref information when scanning tags + Avoid accessing non-tag refs in git-describe unless --all is requested + Teach git-describe --exact-match to avoid expensive tag searches + Use git-describe --exact-match in bash prompt on detached HEAD + Teach git-describe to verify annotated tag names before output + Remove unused variable in builtin-fetch find_non_local_tags + Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch + Ensure tail pointer gets setup correctly when we fetch HEAD only + Allow builtin-fetch's find_non_local_tags to append onto a list + Free the path_lists used to find non-local tags in git-fetch + Teach upload-pack to log the received need lines to an fd + Make git-fetch follow tags we already have objects for sooner + Teach git-fetch to grab a tag at the same time as a commit + Don't allow git-describe failures to go unnoticed in t6120 + Test for packed tags in git-describe output + Add git-describe test for "verify annotated tag names on output" + git-pack-objects: Automatically pack annotated tags if object was packed + Teach fetch-pack/upload-pack about --include-tag + Teach git-fetch to exploit server side automatic tag following + bash: Remove completion of core.legacyheaders option + git-gui: Don't translate the special Apple menu + git-gui: Adjusted Japanese translation to updated POT + +Simon Hausmann (7): + git-p4: Fix submit user-interface. + git-p4: Ensure the working directory and the index are clean before "git-p4 rebase" + git-p4: Remove --log-substitutions feature. + git-p4: Clean up git-p4 submit's log message handling. + git-p4: Removed git-p4 submit --direct. + git-p4: git-p4 submit cleanups. + git-p4: Fix import of changesets with file deletions + +Steffen Prohaska (4): + safecrlf: Add mechanism to warn about irreversible crlf conversions + gitk: Add checkbutton to ignore space changes + t4014: Replace sed's non-standard 'Q' by standard 'q' + Add tests for filesystem challenges (case and unicode normalization) + +Teemu Likonen (1): + bash: Add more long options to be completed with "git --" + +Tim Stoakes (1): + Add `git svn blame' command + +Toby Allsopp (1): + git-p4: Fix indentation from tab to spaces + +Tommy Thorn (2): + git-p4: Fix an obvious typo + git-p4: support exclude paths + +Tor Arvid Lund (1): + git-p4: Support usage of perforce client spec + +Uwe Kleine-König (1): + rev-list: add --branches, --tags and --remotes + +Yann Dirson (1): + Add an --argscmd flag to get the list of refs to show + +eric miao (1): + git-gui: translate the remaining messages in zh_cn.po to chinese + + +Version v1.5.4.5; changes since v1.5.4.4: +----------------------------------------- + +Andy Whitcroft (1): + shortlog: take the first populated line of the description + +Bernt Hansen (1): + git-new-workdir: Share SVN meta data between work dirs and the repository + +Brandon Casey (1): + t/t3800-mktag.sh: use test_must_fail rather than '!' + +Clemens Buchacher (1): + merge-recursive: handle file mode changes + +Daniel Barkalow (2): + Tighten refspec processing + Fix branches file configuration + +Eric Wong (1): + git-svn: don't blindly append '*' to branch/tags config + +Guanqun Lu (1): + Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. + +Jakub Narebski (1): + gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form + +Jeff King (2): + t0021: tr portability fix for Solaris + Documentation: clarify use of .git{ignore,attributes} versus .git/info/* + +Johannes Schindelin (3): + launch_editor(): allow spaces in the filename + git fetch: Take '-n' to mean '--no-tags' + merge-file: handle empty files gracefully + +Jonas Fonseca (1): + Make man page building quiet when DOCBOOK_XSL_172 is defined + +Junio C Hamano (9): + filter-branch: handle "disappearing tree" case correctly in subdir filter + git-pull documentation: warn about the option order + quiltimport: fix misquoting of parsed -p parameter + format-patch: generate MIME header as needed even when there is format.header + rebase -m: do not trigger pre-commit verification + Start draft ReleaseNotes for 1.5.4.5 + git-fetch test: test tracking fetch results, not just FETCH_HEAD + Update draft release notes for 1.5.4.5 + GIT 1.5.4.5 + +Linus Torvalds (1): + rev-parse: fix meaning of rev~ vs rev~0. + +Marc-Andre Lureau (2): + git-svn: fix find-rev error message when missing arg + git-cvsimport: fix merging with remote parent branch + +Mike Hommey (1): + git rebase --abort: always restore the right commit + +Pierre Habouzit (1): + git-quiltimport: better parser to grok "enhanced" series files. + +Vineet Kumar (1): + Minor wording changes in the keyboard descriptions in git-add --interactive. + + +Version v1.5.4.4; changes since v1.5.4.3: +----------------------------------------- + +Adeodato Simó (1): + Really make the LF after reset in fast-import optional + +Björn Steinbrink (1): + receive-pack: Initialize PATH to include exec-dir. + +Brandon Casey (1): + builtin-reflog.c: don't install new reflog on write failure + +Bryan Donlan (1): + Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest + +Caio Marcelo de Oliveira Filho (1): + filter-branch documentation: non-zero exit status in command abort the filter + +Carl Worth (1): + Eliminate confusing "won't bisect on seeked tree" failure + +Daniel Barkalow (3): + Use a single implementation and API for copy_file() + Don't use GIT_CONFIG in t5505-remote + Correct name of diff_flush() in API documentation + +Gerrit Pape (2): + templates/Makefile: don't depend on local umask setting + git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options + +Jay Soffian (2): + rev-parse: fix potential bus error with --parseopt option spec handling + send-email: fix In-Reply-To regression + +Jeff King (1): + revert: actually check for a dirty index + +Johan Herland (2): + Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR + Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR + +Johannes Schindelin (4): + http-push: avoid invalid memory accesses + http-push: do not get confused by submodules + http-push: avoid a needless goto + cvsexportcommit: be graceful when "cvs status" reorders the arguments + +Johannes Sixt (2): + daemon: send more error messages to the syslog + daemon: ensure that base-path is an existing directory + +John Goerzen (1): + Fix dcommit, rebase when rewriteRoot is in use + +Jonathan del Strother (1): + Prompt to continue when editing during rebase --interactive + +Junio C Hamano (6): + Fix "git log --merge --left-right" + Start preparing for 1.5.4.4 + tests: introduce test_must_fail + Update draft release notes for 1.5.4.4 + test-lib: fix TERM to dumb for test repeatability + GIT 1.5.4.4 + +Matthieu Moy (1): + Fix incorrect wording in git-merge.txt. + +Mike Hommey (2): + Set proxy override with http_init() + Fix random crashes in http_cleanup() + +Mike Ralphson (1): + Documentation cherry-pick: Fix cut-and-paste error + +Miklos Vajna (2): + Documentation/git-filter-branch: add a new msg-filter example + Documentation/git svn log: add a note about timezones. + +Pierre Habouzit (1): + unquote_c_style: fix off-by-one. + +Ping Yin (1): + git-submodule: Fix typo 'url' which should be '$url' + +Rémi Vanicat (1): + git.el: find the git-status buffer whatever its name is + +Santi Béjar (1): + ident.c: reword error message when the user name cannot be determined + +Sebastian Noack (1): + git-svn: Don't prompt for client cert password everytime. + +Shawn O. Pearce (6): + Ensure 'make dist' compiles git-archive.exe on Cygwin + Protect peel_ref fallback case from NULL parse_object result + Correct fast-export file mode strings to match fast-import standard + git-gui: Paper bag fix info dialog when no files are staged at commit + Fix 'git remote show' regression on empty repository in 1.5.4 + git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails + +Steven Drake (1): + timezone_names[]: fixed the tz offset for New Zealand. + +Uwe Kleine-König (1): + config.txt: refer to --upload-pack and --receive-pack instead of --exec + + +Version v1.5.4.3; changes since v1.5.4.2: +----------------------------------------- + +Gerrit Pape (1): + git-clone.sh: properly configure remote even if remote's head is dangling + +Jay Soffian (2): + git-gui: support Git Gui.app under OS X 10.5 + send-email: squelch warning due to comparing undefined $_ to "" + +Jeff King (4): + push: indicate partialness of error message + Documentation/push: clarify matching refspec behavior + push: document the status output + hash: fix lookup_hash semantics + +Junio C Hamano (1): + GIT 1.5.4.3 + +Kristian Høgsberg (1): + Rename git-core rpm to just git and rename the meta-pacakge to git-all. + +Miklos Vajna (1): + Documentation/git-stash: document options for git stash list + +Pekka Kaitaniemi (1): + Clarified the meaning of git-add -u in the documentation + +Shawn O. Pearce (5): + git-gui: Ensure error dialogs always appear over all other windows + git-gui: Paper bag fix error dialogs opening over the main window + git-gui: Default TCL_PATH to same location as TCLTK_PATH + git-gui: Avoid hardcoded Windows paths in Cygwin package files + git-gui: Focus insertion point at end of strings in repository chooser + +Wincent Colaiuta (1): + git-gui: relax "dirty" version detection + + +Version v1.5.4.2; changes since v1.5.4.1: +----------------------------------------- + +Christian Couder (8): + config: add test cases for empty value and no value config variables. + diff.c: replace a 'strdup' with 'xstrdup'. + diff.c: remove useless check for value != NULL + config: add 'git_config_string' to refactor string config variables. + Add "const" qualifier to "char *pager_program". + Add "const" qualifier to "char *editor_program". + Add "const" qualifier to "char *excludes_file". + diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver" + +Daniel Barkalow (1): + Validate nicknames of remote branches to prohibit confusing ones + +David Steven Tweed (1): + Make git prune remove temporary packs that look like write failures + +Frank Lichtenheld (1): + config: Fix --unset for continuation lines + +Gerrit Pape (2): + builtin-commit: remove .git/SQUASH_MSG upon successful commit + cvsimport: have default merge regex also match beginning of commit message + +James Bowes (1): + Add a BuildRequires for gettext in the spec file. + +Jay Soffian (1): + mailinfo: feed only one line to handle_filter() for QP input + +Jeff King (2): + status: suggest "git rm --cached" to unstage for initial commit + commit: discard index after setting up partial commit + +Johannes Schindelin (3): + bisect: allow starting with a detached HEAD + Document that the default of branch.autosetupmerge is true + bisect: use verbatim commit subject in the bisect log + +Johannes Sixt (1): + upload-pack: Initialize the exec-path. + +Jonas Fonseca (1): + man pages are littered with .ft C and others + +Junio C Hamano (31): + git-pull documentation: fix markup + archive-tar.c: guard config parser from value=NULL + Add config_error_nonbool() helper function + builtin-apply.c: guard config parser from value=NULL + builtin-branch.c: guard config parser from value=NULL + builtin-commit.c: guard config parser from value=NULL + builtin-config.c: guard config parser from value=NULL + builtin-log.c: guard config parser from value=NULL + builtin-reflog.c: guard config parser from value=NULL + builtin-show-branch.c: guard config parser from value=NULL + builtin-tag.c: guard config parser from value=NULL + connect.c: guard config parser from value=NULL + convert.c: guard config parser from value=NULL + diff.c: guard config parser from value=NULL + git.c: guard config parser from value=NULL + help.c: guard config parser from value=NULL + http.c: guard config parser from value=NULL + merge-recursive.c: guard config parser from value=NULL + remote.c: guard config parser from value=NULL + setup.c: guard config parser from value=NULL + wt-status.c: guard config parser from value=NULL + imap-send.c: guard config parser from value=NULL + builtin-log.c: guard config parser from value=NULL + config.c: guard config parser from value=NULL + Revert "pack-objects: only throw away data during memory pressure" + Protect get_author_ident_from_commit() from filenames in work tree + diff.c: fixup garding of config parser from value=NULL + diff: Fix miscounting of --check output + filter-branch: handle filenames that need quoting + Documentation/git-reset: + GIT 1.5.4.2 + +Martin Koegler (1): + pack-objects: only throw away data during memory pressure + +Mike Hommey (1): + Work around curl-gnutls not liking to be reinitialized + +Miklos Vajna (2): + builtin-gc.c: guard config parser from value=NULL + git clone -s documentation: force a new paragraph for the NOTE + +Pieter de Bie (2): + Documentation/git-reset: don't mention --mixed for selected-paths reset + Documentation/git-reset: Add an example of resetting selected paths + +Sergei Organov (1): + git-cvsimport.txt: fix '-M' description. + +Shawn O. Pearce (1): + fast-import: check return value from unpack_entry() + +Stelian Pop (1): + hg-to-git: fix parent analysis + +Uwe Kleine-König (1): + rebase -i: accept -m as advertised in the man page + + +Version v1.5.4.1; changes since v1.5.4: +--------------------------------------- + +Gerrit Pape (1): + INSTALL: git-merge no longer uses cpio + +Jari Aalto (1): + Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2) + +Junio C Hamano (3): + Update stale documentation links from the main documentation. + Fix "git-commit -C $tag" + gitattributes: fix relative path matching + +Jörg Sommer (2): + git-am: fix type in its usage string + git-remote documentation: fix synopsis to match description + +Tim Stoakes (1): + Fix typo in 'blame' documentation. + +Timo Hirvonen (1): + Fix parsing numeric color values + + +Version v1.5.4; changes since v1.5.4-rc5: +----------------------------------------- + +Brandon Casey (4): + git-relink: avoid hard linking in objects/info directory + filter-branch.sh: remove temporary directory on failure + filter-branch docs: remove brackets so not to imply revision arg is optional + filter-branch: assume HEAD if no revision supplied + +Bruno Ribas (1): + gitweb: Make use of the $git_dir variable at sub git_get_project_description + +Christian Couder (3): + Documentation: config: add "browser..path". + Documentation: help: specify supported html browsers. + instaweb: use 'browser..path' config option if it's set. + +Jakub Narebski (1): + gitweb: Add info about $projectroot and $projects_list to gitweb/README + +Jean-Luc Herren (1): + Documentation/git-cvsserver: Fix typo + +Jeff King (1): + t9001: add missing && operators + +Jim Meyering (1): + fix doc typos + +Johannes Schindelin (1): + Add test for rebase -i with commits that do not pass pre-commit + +Junio C Hamano (4): + reflog-expire: Avoid creating new files in a directory inside readdir(3) loop + Revert "filter-branch docs: remove brackets so not to imply revision arg is optional" + Fix "git checkout -b foo ':/substring'" + GIT 1.5.4 + +Michele Ballabio (1): + Fix typo in a comment in t/test-lib.sh + +Miklos Vajna (1): + git rev-parse manpage: spelling fix + +Shawn O. Pearce (1): + Use 'printf %s $x' notation in t5401 + +Yasushi SHOJI (1): + gitweb: Convert generated contents to utf8 in commitdiff_plain + + +Version v1.5.4-rc5; changes since v1.5.4-rc4: +--------------------------------------------- + +Alex Riesen (1): + Make t5710 more strict when creating nested repos + +Brandon Casey (1): + git-commit: exit non-zero if we fail to commit the index + +Eric Wong (1): + git-svn: default to repacking every 1000 commits + +Gustaf Hendeby (1): + send-email, fix breakage in combination with --compose + +Jakub Narebski (1): + autoconf: define NO_SYS_SELECT_H on systems without . + +Johannes Schindelin (1): + pull --rebase: be cleverer with rebased upstream branches + +Junio C Hamano (5): + git-submodule: rename shell functions for consistency + git-submodule: fix subcommand parser + git-submodule: add test for the subcommand parser fix + Clarify that http-push being temporarily disabled with older cURL + GIT 1.5.4-rc5 + +Mike Hommey (2): + Add a missing dependency on http.h + Documentation: add a bit about sendemail.to configuration + +Miklos Vajna (2): + git-clone -s: document problems with git gc --prune + git pull manpage: don't include -n from fetch-options.txt + +Nicolas Pitre (1): + pack-objects: Fix segfault when object count is less than thread count + +Pierre Habouzit (1): + parse-options: catch likely typo in presense of aggregated options. + +Robert Schiele (2): + pre-POSIX.1-2001 systems do not have + Makefile: customization for supporting HP-UX + +Sam Vilain (1): + git-svn(1): update instructions for resuming a git-svn clone + +Shawn O. Pearce (10): + git-gui: Honor the standard commit-msg hook + git-gui: Correct window title for hook failure dialogs + git-gui: Consolidate hook execution code into a single function + git-gui: Correct encoding of glossary/fr.po to UTF-8 + Teach fast-import to honor pack.compression and pack.depth + Document the hairy gfi_unpack_entry part of fast-import + git-gui: Work around random missing scrollbar in revision list + git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available + git-gui: Make the statistics of po2msg match those of msgfmt + git-gui: Correctly cleanup msgfmt '1 message untranslated' output + +Steffen Prohaska (3): + submodule: Document the details of the command line syntax + t9400-git-cvsserver-server: Wrap setup into test case + cvsserver: Fix for histories with multiple roots + + +Version v1.5.4-rc4; changes since v1.5.4-rc3: +--------------------------------------------- + +Bill Lear (1): + Correct spelling in diff.c comment + +Brandon Casey (4): + close_lock_file(): new function in the lockfile API + Improve use of lockfile API + refs.c: rework ref_locks by abstracting from underlying struct lock_file + fast-import.c: don't try to commit marks file if write failed + +Christian Couder (2): + git-gui: Initial french translation + git-gui: add french glossary: glossary/fr.po + +Christian Stimming (4): + git-gui: Update glossary: add term "hunk" + git-gui: Update German translation + git-gui: Fix broken revert confirmation. + git-gui: Improve German translation. + +Dan McGee (3): + Remove usage of git- (dash) commands from email hook + cvsimport: remove last use of repo-config from git standard tools + Update git-completion for new 'remote rm' option + +Dave Peticolas (1): + Documentation: fix and clarify grammar in git-merge docs. + +Dmitry Potapov (1): + treat any file with NUL as binary + +Eric Wong (1): + git-svn: handle leading/trailing whitespace from svnsync revprops + +Grégoire Barbier (4): + http-push: disable http-push without USE_CURL_MULTI + http-push: fix webdav lock leak. + http-push: fail when info/refs exists and is already locked + http-push and http-fetch: handle URLs without trailing / + +Jakub Narebski (1): + autoconf: Add checking for unsetenv function + +Jean-Luc Herren (1): + Make default pre-commit hook less noisy + +Jeff King (5): + git-clean: fix off-by-one memory access when given no arguments + color unchanged lines as "plain" in "diff --color-words" + send-email: detect invocation errors earlier + send-email: validate patches before sending anything + send-email: add no-validate option + +Jim Meyering (2): + fast-import: Don't use a maybe-clobbered errno value + doc typo: s/prior committing/prior to committing/ + +Johannes Schindelin (1): + gitk: make Ctrl "+" really increase the font size + +Junio C Hamano (8): + builtin-commit.c: remove useless check added by faulty cut and paste + Revert "builtin-commit.c: remove useless check added by faulty cut and paste" + Fix git-rerere documentation + Squelch bogus progress output from git-rebase--interactive + Document lockfile API + Officially deprecate repo-config. + http-push: clarify the reason of error from the initial PROPFIND request + GIT 1.5.4-rc4 + +Kristian Høgsberg (1): + git-commit: fix double close(2) that can close a wrong file descriptor + +Lars Hjemli (1): + Move sha1_file_to_archive into libgit + +Linus Torvalds (4): + Fix performance regression for partial commits + Make builtin-commit.c more careful about parenthood + Make 'git fsck' complain about non-commit branches + Be more careful about updating refs + +Mark Drago (1): + hg-to-git: improve popen calls + +Mark Levedahl (1): + git-gui: Makefile - Handle $DESTDIR on Cygwin + +Martin Koegler (1): + parse_commit_buffer: tighten checks while parsing + +Miklos Vajna (3): + Add using merge subtree How-To + ls-remote: add -t and -h options. + Include rev-list options in git-log manpage. + +Peter Karlsson (1): + git-gui: Updated Swedish translation after mailing list review. + +Shawn O. Pearce (3): + git-gui: Allow 'Create New Repository' on existing directories + git-gui: Refresh file status description after hunk application + Fix random fast-import errors when compiled with NO_MMAP + +Thomas Zander (1): + core-tutorial typofix + + +Version v1.5.4-rc3; changes since v1.5.4-rc2: +--------------------------------------------- + +Alexandre Julliard (6): + git.el: Support for getting diffs from inside the log-edit buffer. + git.el: Retrieve the permissions for up-to-date files. + git.el: Display file types and type changes. + git.el: Make sure we never insert the same file twice. + git.el: Refresh files from their real state upon commit. + git.el: Make status refresh faster. + +Bernt Hansen (1): + git-gui: Make commit log messages end with a newline + +Brandon Casey (1): + git-relink.txt: describe more clearly how hard linking occurs + +Charles Bailey (1): + gitk: Fix the Makefile to cope with systems lacking msgfmt + +Christian Couder (1): + Documentation: config: add 'help.*' and 'instaweb.*' variables. + +Christian Stimming (10): + gitk i18n: Add Makefile with rules for po file creation and installation + gitk i18n: Import msgcat for message string translation; load translation catalogs + gitk i18n: Markup several strings for translation + gitk i18n: Initial German translation + gitk i18n: More markup -- various options menus + gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. + gitk: Update and fix Makefile + gitk: Update German translation + gitk: Fix typo in user message. + gitk: Update German translation. + +Dan McGee (1): + Documentation: rename gitlink macro to linkgit + +Eric Wong (4): + git-svn: allow dcommit --no-rebase to commit multiple, dependent changes + git-svn: unlink index files that were globbed, too + git-svn: support for funky branch and project names over HTTP(S) + git-svn: clarify the "Ignoring error from SVN" piece + +Florian La Roche (1): + Change git-gc documentation to reflect gc.packrefs implementation. + +Gerrit Pape (1): + gitk: use user-configured background in view definition dialog + +Grégoire Barbier (1): + Fix double-free() in http-push.c:remote_exists() + +Gustaf Hendeby (1): + Documentation/user-manual.txt: fix typo + +J. Bruce Fields (1): + Documentation: fix remote..skipDefaultUpdate description + +James Bowes (1): + Make the git metapackage require the same version of the subpackages. + +Jeff King (8): + config: handle lack of newline at end of file better + git-reset: refuse to do hard reset in a bare repository + add a "basic" diff config callback + diff: load funcname patterns in "basic" config + diff: remove lazy config loading + add--interactive: remove unused diff colors + add--interactive: allow diff colors without interactive colors + Document the color.interactive semantics + +Jim Meyering (3): + Fix grammar nits in documentation and in code comments. + Don't access line[-1] for a zero-length "line" from fgets. + bundle, fast-import: detect write failure + +Johannes Schindelin (2): + Optimize prefixcmp() + shortlog: mention the "-e" option in the usage + +Johannes Sixt (2): + git-gui: Move frequently used commands to the top of the context menu. + recv_sideband: Do not use ANSI escape sequence on dumb terminals. + +Junio C Hamano (27): + Documentation/git-submodule.txt: typofix + "git pull --tags": error out with a better message. + git-rebase -i behaves better on commits with incomplete messages + git-rebase -i: clean-up error check codepath. + lock_any_ref_for_update(): reject wildcard return from check_ref_format + Update callers of check_ref_format() + Uninline prefixcmp() + git-clean: make "Would remove ..." path relative to cwd again + t/t7600: avoid GNUism in grep + t/t{3600,3800,5401}: do not use egrep when grep would do + t/t3800: do not use a temporary file to hold expected result. + Update draft release notes for 1.5.4 + git-stash clear: refuse to work with extra parameter for now + git-rev-parse --symbolic-full-name + filter-branch: work correctly with ambiguous refnames + custom pretty format: tolerate empty e-mail address + Documentation: remove gitman.info with "make clean" + Documentation: fix "gitlink::foobar[s]" + utf8: pick_one_utf8_char() + utf8_width(): allow non NUL-terminated input + diff: do not chomp hunk-header in the middle of a character + Update draft release notes for 1.5.4 + GIT 1.5.3.8 + "git-apply --check" should not report "fixed" + pack-objects: remove redundant and wrong call to deflateEnd() + RPM spec: include gitk message files. + GIT 1.5.4-rc3 + +Kevin Ballard (1): + Trim leading / off of paths in git-svn prop_walk + +Marco Costalba (2): + Document git-reset defaults to HEAD if no commit is given + git-stash: use stdout instead of stderr for non error messages + +Mark Levedahl (2): + git-gui: Unconditionally use absolute paths with Cygwin + Documentation/Makefile - honor $DESTDIR for quick-install target + +Martin Koegler (4): + receive-pack: check object type of sha1 before using them as commits + receive-pack: reject invalid refnames + parse_tag_buffer: don't parse invalid tags + tree-walk: don't parse incorrect entries + +Michael Stefaniuc (1): + git-am: Run git gc only once and not for every patch. + +Michele Ballabio (1): + Document some default values in config.txt + +Miklos Vajna (2): + git-sh-setup: document git_editor() and get_author_ident_from_commit() + t/t7001: avoid unnecessary ERE when using grep + +Nicolas Pitre (1): + slightly better auto gc message + +Paul Mackerras (2): + gitk: Recode de.po to UTF-8 + gitk: Restore some widget options whose defaults changed in Tk 8.5 + +Peter Karlsson (1): + Added Swedish translation. + +Ralf Wildenhues (1): + Documentation: typofix + +Rogan Dawes (1): + Allow git-mergetool to handle paths with a leading space + +Shawn O. Pearce (1): + git-gui: Handle file mode changes (644->755) in diff viewer + + +Version v1.5.4-rc2; changes since v1.5.4-rc1: +--------------------------------------------- + +Alex Riesen (1): + Allow selection of different cleanup modes for commit messages + +Arjen Laarhoven (1): + Fix "git log --diff-filter" bug + +Charles Bailey (1): + Remove old generated files from .gitignore. + +Gustaf Hendeby (2): + Make git send-email accept $EDITOR with arguments + shortlog manpage documentation: work around asciidoc markup issues + +Jakub Narebski (1): + gitweb: fix whitespace in config_to_multi (indent with tab) + +Jeff King (2): + clean up 1.5.4 release notes + cvsimport: die on cvsps errors + +Jim Meyering (1): + Don't dereference NULL upon lookup failure. + +Johannes Schindelin (2): + Teach diff machinery to display other prefixes than "a/" and "b/" + Mention git-shell's "cvs" substitution in the RelNotes + +Junio C Hamano (14): + t4024: fix test script to use simpler sed pattern + fix git commit --amend -m "new message" + shell-scripts usage(): consistently exit with non-zero + Documentation: ls-files -v is about "assume unchanged". + Fix $EDITOR regression introduced by rewrite in C. + t7005: do not exit inside test. + builtin-commit: fix amending of the initial commit + builtin-commit: avoid double-negation in the code. + Documentation: describe 'union' low-level merge driver + Fix documentation of --first-parent in git-log and copy it to git-rev-list + combine-diff: Fix path quoting + Fix rewrite_diff() name quoting. + contrib: resurrect scripted git-revert. + GIT 1.5.4-rc2 + +Linus Torvalds (1): + Re(-re)*fix trim_common_tail() + +Miklos Vajna (1): + everyday: replace 'prune' and 'repack' with 'gc' + +Pierre Habouzit (3): + git-tag: fix -l switch handling regression. + Force the sticked form for options with optional arguments. + parse-options: Add a gitcli(5) man page. + +René Scharfe (1): + Make "--pretty=format" parser a bit more careful. + +Shawn O. Pearce (2): + Reallow git-rebase --interactive --continue if commit is unnecessary + Improve error messages when int/long cannot be parsed from config + +Stefan Sperling (1): + Small comment fix for git-cvsimport. + +Wincent Colaiuta (1): + Emit helpful status for accidental "git stash" save + + +Version v1.5.4-rc1; changes since v1.5.4-rc0: +--------------------------------------------- + +Andy Whitcroft (1): + git-svn: expand handling of From: and Signed-off-by: + +Charles Bailey (1): + Fix git-instaweb breakage on MacOS X due to the limited sed functionality + +Christian Couder (1): + git-help: add "help.format" config variable. + +David S. Miller (1): + fast-import: fix unalinged allocation and access + +Eric Wong (5): + git-svn: unlink internal index files after operations + git-svn: handle our top-level path being deleted and later re-added + git-svn: avoid leaving leftover committer/author info in rebase + git-svn: workaround a for broken symlinks in SVN + git-svn: avoid warning when run without arguments + +Finn Arne Gangstad (1): + Improved submodule merge support + +H.Merijn Brand (1): + the use of 'tr' in the test suite isn't really portable + +J. Bruce Fields (8): + whitespace: fix off-by-one error in non-space-in-indent checking + whitespace: reorganize initial-indent check + whitespace: minor cleanup + whitespace: fix initial-indent checking + whitespace: more accurate initial-indent highlighting + whitespace: fix config.txt description of indent-with-non-tab + builtin-apply: minor cleanup of whitespace detection + builtin-apply: stronger indent-with-on-tab fixing + +Jakub Narebski (2): + gitweb: disambiguate heads and tags withs the same name + gitweb: Teach "a=blob" action to be more lenient about blob/file mime type + +Jeff King (7): + cvsexportcommit: fix massive commits + trim_common_tail: brown paper bag fix. + teach bash completion to treat commands with "--" as a helper + rename git-browse--help to git-help--browse + clone: correctly report http_fetch errors + git-send-email: avoid duplicate message-ids + test "git clone -o" + +Jim Meyering (1): + git-filter-branch.sh: more portable tr usage: use \012, not \n. + +Johannes Schindelin (4): + Support config variable diff.external + Document diff.external and mergetool..path + rebase -p -i: handle "no changes" gracefully + git show : show the tagger + +Johannes Sixt (4): + threaded pack-objects: Use condition variables for thread communication. + Plug a resource leak in threaded pack-objects code. + Clean up documentation that references deprecated 'git peek-remote'. + filter-branch: Remove broken and unnecessary summary of rewritten refs. + +Junio C Hamano (17): + git-commit: squelch needless message during an empty merge + xdl_diff: identify call sites. + xdi_diff: trim common trailing lines + diff --check: minor fixups + xdiff tail trimming: use correct type. + commit: allow --amend to reuse message from another commit + remote: Fix bogus make_branch() call in configuration reader. + Rename git-browse-help helper to git-browse--help + Retire git-runstatus for real. + Start preparing the API documents. + Update draft release notes for 1.5.4 + Re-re-re-fix common tail optimization + builtin-commit: fix summary output. + builtin-commit: make summary output consistent with status + Documentation/git-submodule: refer to gitmodules(5) + builtin-blame.c: remove unneeded memclr() + GIT 1.5.4-rc1 + +Kristian Høgsberg (1): + Use a strbuf for building up section header and key/value pair strings. + +Li Hong (1): + Fix a memory leak + +Linus Torvalds (1): + unpack-trees: FLEX_ARRAY fix + +Marco Roeland (1): + clone: fix options '-o' and '--origin' to be recognised again + +Mike Hommey (8): + Fix some more memory leaks in http-push.c + Fix random sha1 in error message in http-fetch and http-push + Remove the default_headers variable from http-push.c + Remove a CURLOPT_HTTPHEADER (un)setting + Avoid redundant declaration of missing_target() + Use strbuf in http code + Fix various memory leaks in http-push.c and http-walker.c + Move fetch_ref from http-push.c and http-walker.c to http.c + +Nicolas Pitre (3): + provide advance warning of some future pack default changes + fix style of a few comments in diff-delta.c + make 'git describe --all --contains' work + +Petr Baudis (1): + gitweb: Make config_to_multi return [] instead of [undef] + +Pierre Habouzit (1): + Fix segfault in diff-delta.c when FLEX_ARRAY is 1 + +Ralf Wildenhues (1): + Fix some documentation typos. + +Sam Vilain (1): + Clarify error response from 'git fetch' for bad responses + +Sean Estabrooks (1): + Fix interactive rebase to preserve author email address + +Shawn Bohrer (1): + Fix spelling mistakes in user manual + +Shawn O. Pearce (2): + Avoid update hook during git-rebase --interactive + Catch and handle git-commit failures in git-rebase --interactive + +Wincent Colaiuta (6): + "diff --check" should affect exit status + Unify whitespace checking + Make "diff --check" output match "git apply" + Add tests for "git diff --check" with core.whitespace options + Use shorter error messages for whitespace problems + Test interaction between diff --check and --exit-code + +anonymous (1): + Documentation: describe pack idx v2 + + +Version v1.5.4-rc0; changes since v1.5.3.8: +------------------------------------------- + +Alex Riesen (12): + fix t5403-post-checkout-hook.sh: built-in test in dash does not have "==" + Fix a crash in ls-remote when refspec expands into nothing + More updates and corrections to the russian translation of git-gui + Rework make_usage to print the usage message immediately + Updated russian translation of git-gui + Do no colorify test output if stdout is not a terminal + Add a test checking if send-pack updated local tracking branches correctly + Update the tracking references only if they were succesfully updated on remote + Fix dependencies of parse-options test program + Do not generate full commit log message if it is not going to be used + Simplify crud() in ident.c + Fix git-fast-export for zero-sized blobs + +Alexandre Julliard (12): + git.el: Keep the status buffer sorted by filename. + git.el: Allow selecting whether to display uptodate/unknown/ignored files. + git.el: Allow the add and remove commands to be applied to ignored files. + git.el: Preserve file marks when doing a full refresh. + git.el: Do not print a status message on every git command. + git.el: Update a file status in the git buffer upon save. + git.el: Reset the permission flags when changing a file state. + git.el: Fix typo in "Reverted file" message. + git.el: Fix typo in git-update-saved-file error handling. + git.el: Refresh only the changed file marks when marking/unmarking all. + git.el: Run git-gc --auto after commits. + git.el: Added a menu for git-status-mode. + +Andreas Ericsson (1): + Simplify strchrnul() compat code + +André Goddard Rosa (2): + Print the real filename that we failed to open. + Error out when user doesn't have access permission to the repository + +Andy Parkins (4): + parse_date_format(): convert a format name to an enum date_mode + Make for-each-ref allow atom names like ":" + Make for-each-ref's grab_date() support per-atom formatting + Add a test script for for-each-ref, including test of date formatting + +Andy Whitcroft (6): + Teach send-pack a mirror mode + git-push: plumb in --mirror mode + Add tests for git push'es mirror mode + git-push: add documentation for the newly added --mirror mode + git-quiltimport.sh fix --patches handling + git-svn: add support for pulling author from From: and Signed-off-by: + +Anton Gyllenberg (1): + gitview: import only one of gtksourceview and gtksourceview2 + +Ask Bjørn Hansen (1): + send-email: Don't add To: recipients to the Cc: header + +Benoit Sigoure (7): + git-svn: add a generic tree traversal to fetch SVN properties + git-svn: implement git svn create-ignore + git-svn: add git svn propget + git-svn: add git svn proplist + git-svn: simplify the handling of fatal errors + core-tutorial: Catch up with current Git + git-svn: sort the options in the --help message. + +Björn Steinbrink (1): + git config: Don't rely on regexec() returning 1 on non-match + +Blake Ramsdell (1): + transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable + +Brandon Casey (2): + git-gc: by default use safer "-A" option to repack when not --prune'ing + git-gc --auto: simplify "repack" command line building + +Brian Ewins (2): + Add a --dry-run option to git-send-pack. + Add a --dry-run option to git-push. + +Brian Gernhardt (3): + format-patch: Add configuration and off switch for --numbered + format-patch: Test --[no-]numbered and format.numbered + t3502: Disambiguate between file and rev by adding -- + +Brian M. Carlson (1): + git-gui: Reorder msgfmt command-line arguments + +Carlos Rica (5): + Function for updating refs. + Add tests for documented features of "git reset". + Move make_cache_entry() from merge-recursive.c into read-cache.c + Make "git reset" a builtin. + Make builtin-tag.c use parse_options. + +Charles Bailey (1): + Fix clone not to ignore depth when performing a local clone + +Chris Pettitt (3): + git-p4 support for perforce renames. + git-p4: Add a helper function to parse the full git diff-tree output. + git-p4: Detect changes to executable bit and include them in p4 submit. + +Christian Couder (27): + rev-list --bisect: Move finding bisection into do_find_bisection. + rev-list --bisect: Move some bisection code into best_bisection. + rev-list --bisect: Bisection "distance" clean up. + rev-list --bisect: Fix best == NULL case. + Test suite: reset TERM to its previous value after testing. + rev-list: implement --bisect-all + rev-list documentation: add "--bisect-all". + Bisect: fix some white spaces and empty lines breakages. + Bisect: implement "bisect skip" to mark untestable revisions. + Bisect: refactor "bisect_write_*" functions. + Bisect: refactor some logging into "bisect_write". + Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state". + Bisect: add "bisect skip" to the documentation. + Bisect: add a "bisect replay" test case. + Bisect run: "skip" current commit if script exit code is 125. + Bisect: add "skip" to the short usage string. + Bisect reset: remove bisect refs that may have been packed. + Bisect visualize: use "for-each-ref" to list all good refs. + Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting. + Bisect reset: do nothing when not bisecting. + Documentation: add a new man page for "git-help" + Trace and quote with argv: get rid of unneeded count argument. + git-help: add -i|--info option to display info page. + Documentation: describe -i/--info option to "git-help" + git-help: add -w|--web option to display html man page in a browser. + Use {web,instaweb,help}.browser config options. + Documentation: describe -w/--web option to "git-help". + +Christian Stimming (14): + Mark strings for translation. + Makefile rules for translation catalog generation and installation. + Add glossary that can be converted into a po file for each language. + Add glossary translation template into git. + German translation for git-gui + German glossary for translation + git-gui: Add more words to translation glossary + git-gui: Update German glossary according to mailing list discussion + git-gui: Incorporate glossary changes into existing German translation + git-gui: Update German translation, including latest glossary changes + git-gui: Add more terms to glossary. + git-gui: Update German translation + Update git-gui.pot with latest (few) string additions and changes. + Update German translation. 100% completed. + +Dan McGee (1): + Remove outdated references to cogito in documentation + +Daniel Barkalow (23): + Refactor http.h USE_CURL_MULTI fill_active_slots(). + Make function to refill http queue a callback + Remove obsolete commit-walkers + Modularize commit-walker + Add uploadpack configuration info to remote. + Report information on branches from remote.h + Make fetch-pack a builtin with an internal API + Push code for transport library + Add matching and parsing for fetch-side refspec rules + Add fetch methods to transport library. + Make fetch a builtin + Allow abbreviations in the first refspec to be merged + Fix adding a submodule with a remote url + Restore default verbosity for http fetches. + Remove duplicate ref matches in fetch + Correct handling of upload-pack in builtin-fetch-pack + Miscellaneous const changes and utilities + Build-in peek-remote, using transport infrastructure. + Use built-in send-pack. + Build-in send-pack, with an API for other programs to call. + Build in ls-remote + Use parseopts in builtin-push + Add more checkout tests + +David D. Kilzer (8): + git-svn log: fix ascending revision ranges + git-svn log: include commit log for the smallest revision in a range + git-svn log: handle unreachable revisions like "svn log" + git-send-email: show all headers when sending mail + git-svn: extract reusable code into utility functions + git-svn info: implement info command + git-svn: info --url [path] + git-svn: Remove unnecessary Git::SVN::Util package + +David Kastrup (3): + diff-delta.c: pack the index structure + diff-delta.c: Rationalize culling of hash buckets + git-commit.sh: Shell script cleanup + +David Reiss (1): + git-svn: Fix a typo and add a comma in an error message in git-svn + +David Symonds (7): + gitweb: Provide title attributes for abbreviated author names. + gitweb: Refactor abbreviation-with-title-attribute code. + gitweb: Use chop_and_escape_str in more places. + Rearrange git-format-patch synopsis to improve clarity. + git-checkout: Support relative paths containing "..". + git-checkout: Test for relative path use. + Mention that git-rm can be an appropriate resolution as well as git-add. + +Denis Cheng (1): + gitweb: the commitdiff is very commonly used, it's needed on search page, too + +Dmitry Potapov (1): + preserve executable bits in zip archives + +Douglas Stockwell (1): + send-email: Add support for SSL and SMTP-AUTH + +Emil Medve (2): + Fixed a command line option type for builtin-fsck.c + git-stash: Fix listing stashes + +Eric Wong (6): + git-svn: support for funky branch and project names over HTTP(S) + git-svn: add tests for command-line usage of init and clone commands + t9106: fix a race condition that caused svn to miss modifications + git-svn: allow `info' command to work offline + git-svn: replace .rev_db with a more space-efficient .rev_map format + git-svn: reinstate old rev_db optimization in new rev_map + +Eygene Ryabinkin (2): + git-svn: respect Subversion's [auth] section configuration values + git-svn: use "no warnings 'once'" to disable false-positives + +Eyvind Bernhardsen (1): + Fix mis-markup of the -p, --patch option in git-add(1) + +Frederick Akalin (1): + gtksourceview2 support for gitview + +Gerrit Pape (9): + No longer install git-svnimport, move to contrib/examples + git-reset: add -q option to operate quietly + contrib/hooks/post-receive-email: fix typo + contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars + contrib/hooks/post-receive-email: make subject prefix configurable + hooks--update: fix test for properly set up project description file + hooks--update: decline deleting tags or branches by default, add config options + contrib/hooks/post-receive-email: remove cruft, $committer is not used + Don't cache DESTDIR in perl/perl.mak. + +Gordon Hopper (1): + git-cvsimport: fix handling of user name when it is not set in CVSROOT + +Guido Ostkamp (2): + Remove unreachable statements + Use compat mkdtemp() on Solaris boxes + +Gustaf Hendeby (1): + git-svn now reads settings even if called in subdirectory + +H.Merijn Brand (1): + Do not rely on the exit status of "unset" for unset variables + +Harri Ilari Tapio Liusvaara (1): + git-gui: Disambiguate "commit" + +Heikki Orsila (1): + git-clone: honor "--" to end argument parsing + +Irina Riesen (1): + git-gui: initial version of russian translation + +J. Bruce Fields (3): + git-rebase: support --whitespace=