--- git-1.7.1.orig/debian/gitweb.examples +++ git-1.7.1/debian/gitweb.examples @@ -0,0 +1 @@ +debian/examples/index.aux-generation --- git-1.7.1.orig/debian/copyright +++ git-1.7.1/debian/copyright @@ -0,0 +1,260 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Source: http://www.kernel.org/pub/software/scm/git/ + +Files: * +Copyright: © 2005-2010, Linus Torvalds and others. +License: GPL-2 + You can redistribute this software and/or modify it under the terms of + the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: xdiff/* +Copyright: © 2003-2009, Davide Libenzi, Johannes E. Schindelin +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-2.1. + +Files: git-gui/* +Copyright: © 2006-2009, Shawn Pearce, et al. +License: GPL-2+ + +Files: git-gui/po/de.po, git-gui/po/fr.po, git-gui/po/glossary/* +Copyright: © 2007-2008, Shawn Pearce, et al. +License: GPL-2 + This file is distributed under the same license as the git package. + +Files: git-svn.perl +Copyright: © 2006, Eric Wong +License: GPL-2+ + +Files: gitk-git/* +Copyright: © 2005-2009, Paul Mackerras, et al. +License: GPL-2+ + This program is free software; it may be used, copied, modified + and distributed under the terms of the GNU General Public Licence, + either version 2, or (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2. + +Files: gitweb/gitweb.js +Copyright: © 2007, Fredrik Kuivinen + 2007, Petr Baudis + 2008-2009, Jakub Narebski +License: GPL-2+ + +Files: imap-send.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack +Name: git-imap-send - drops patches into an imap Drafts folder + derived from isync/mbsync - mailbox synchronizer +License: GPL-2+ + +Files: perl/Git.pm +Copyright: © 2006, by Petr Baudis +License: GPL-2+ + This module is free software; it may be used, copied, modified + and distributed under the terms of the GNU General Public Licence, + either version 2, or (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2. + +Files: perl/private-Error.pm +Copyright: © 1997-8, Graham Barr +License: Perl + This program is free software; you can redistribute it and/or + modify it under the same terms as Perl itself. + +Files: trace.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack + © 2006, Christian Couder +License: GPL-2+ + +Files: compat/fnmatch/* +Copyright: © 1991-1999, Free Software Foundation, Inc. +License: LGPL-2+ + This file is part of the GNU C Library. + . + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + On Debian systems, the complete text of the GNU Library General Public License + can be found in the /usr/share/common-licenses/LGPL-2 file. + +Files: compat/inet_ntop.c, compat/inet_pton.c +Copyright: © 1996-2001, Internet Software Consortium. +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +Files: compat/nedmalloc/* +Copyright: © 2005-2006 Niall Douglas +License: + It is licensed under the Boost Software License which basically means + you can do anything you like with it. This does not apply to the malloc.c.h + file which remains copyright to others. + . + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: compat/nedmalloc/malloc.c.h +Copyright: © 2006, KJK::Hyperion +License: + This is a version (aka dlmalloc) of malloc/free/realloc written by + Doug Lea and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain. Send questions, + comments, complaints, performance data, etc to dl@cs.oswego.edu + . + Incorporates code from intrin_x86.h, which bears the following notice: + . + Compatibility header for GCC -- GCC equivalents of intrinsic + Microsoft Visual C++ functions. Originally developed for the ReactOS + () and TinyKrnl () + projects. + . + Copyright (c) 2006 KJK::Hyperion + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: compat/regex/* +Copyright: © 1985, 1989-1993, Free Software Foundation, Inc. +Name: Extended regular expression matching and search library, version 0.12. +License: GPL-2+ + +Files: contrib/fast-import/git-p4 +Copyright: © 2007, Simon Hausmann + © 2007, Trolltech ASA +License: MIT + : + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +Files: contrib/hg-to-git/hg-to-git.py +Copyright: © 2007, Stelian Pop +Name: hg-to-git.py - A Mercurial to GIT converter +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: © 2005, Sebastian Kuzminsky + © 2005-2006, Andres Salomon + © 2005-2010, Gerrit Pape +License: GPL-2 + +This package was debianized by Sebastian Kuzminsky +on Thu, 5 May 2005 10:27:14 -0600, +and was adopted by Gerrit Pape +on Wed, 16 Nov 2005 19:37:14 +0000. + +The gitweb package was debianized by Andres Salomon +on Fri, 20 May 2005 11:23:12 -0400, +and adopted to be included in this package +on Thu, 27 Jul 2006 21:43:38 +0000. + --- git-1.7.1.orig/debian/git.conffiles +++ git-1.7.1/debian/git.conffiles @@ -0,0 +1,2 @@ +/etc/bash_completion.d/git +/etc/emacs/site-start.d/50git-core.el --- git-1.7.1.orig/debian/control +++ git-1.7.1/debian/control @@ -0,0 +1,225 @@ +Source: git +Section: vcs +Priority: optional +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, cvsps, libdbd-sqlite3-perl, + libc6.1 (>= 2.10.2-6) [ia64] +Standards-Version: 3.8.4.0 +Vcs-Git: http://smarden.org/git/git.git/ + +Package: git +Architecture: any +Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl, + libc6.1 (>= 2.10.2-6) [ia64] +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-core (<= 1:1.7.0.4-1) +Conflicts: git (<< 4.3.20-11), qgit (<< 1.5.5), git-core (<= 1:1.7.0.4-1) +Provides: git-completion, git-core +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-core +Architecture: all +Depends: git (>> 1:1.7.0.2) +Description: fast, scalable, distributed revision control system (obsolete) + 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 is a transitional dummy package. The 'git-core' package has been + renamed to 'git', which has been installed automatically. This + git-core package is now obsolete, and can safely be removed from the + system. + +Package: git-doc +Section: doc +Architecture: all +Suggests: git, 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 (>> ${source:Upstream-Version}), git (<< ${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 (>> ${source:Upstream-Version}), git (<< ${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 (>> ${source:Upstream-Version}), git (<< ${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 (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.) +Recommends: libemail-valid-perl, libnet-smtp-ssl-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 (>> ${source:Upstream-Version}), git (<< ${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. + . + git-daemon, as provided by the git package, is a simple server for git + repositories, ideally suited for read-only updates, i.e. pulling from git + repositories through the network. This package provides a runit service + for running git-daemon permanently. + +Package: git-gui +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${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 (>> ${source:Upstream-Version}), git (<< ${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 (>> ${source:Upstream-Version}), git (<< ${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. + +Package: git-all +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), git-doc, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb +Recommends: git-daemon-run +Description: fast, scalable, distributed revision control system (all subpackages) + 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 is a dummy package which brings in all subpackages. --- git-1.7.1.orig/debian/changelog +++ git-1.7.1/debian/changelog @@ -0,0 +1,2010 @@ +git (1:1.7.1-1ubuntu0~ppa1) lucid; urgency=low + + * Build for lucid. + + -- Andrey Voronov Sun, 02 May 2010 09:04:11 +0300 + +git (1:1.7.1-1) unstable; urgency=low + + * debian/diff/0003-t-t7400-submodule-basic.sh-debug-output-...diff: + remove; obsolete. + * debian/diff/0003-git-submodule.sh-properly-initialize-shell-...diff: + new; git-submodule.sh: properly initialize shell variables (closes: + #569594). + * debian/rules: no longer set ARCH='$(ARCH)' in environment for make + test. + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Sun, 25 Apr 2010 23:35:50 +0000 + +git (1:1.7.0.5-2~dbg0) unstable; urgency=low + + * debian/diff/0003-t7400-submodule-basic.sh-alpha-s390-skip-...diff: + remove; more archs are affected (additionally hppa, armel). + * debian/diff/0003-t-t7400-submodule-basic.sh-debug-output-...diff: + new; t/t7400-submodule-basic.sh: debug output for t7400.24 'update + --init'. + + -- Gerrit Pape Fri, 23 Apr 2010 12:15:18 +0000 + +git (1:1.7.0.5-1) unstable; urgency=low + + * debian/git-core.postinst: new; replace /usr/share/doc/git-core with + symlink /usr/share/doc/git-core -> git on upgrade from <= 1.7.0.4-2 + (closes: #578298). + * debian/diff/0003-t7400-submodule-basic.sh-alpha-s390-skip-...diff: + new; t7400-submodule-basic.sh: alpha, s390: skip 'update --init' + test (workaround: #569594). + * debian/control: no longer Replaces, Conflicts: git-completion (thx + Jonathan Nieder, closes: #577730). + * new upstream point release. + * debian/rules: set ARCH='$(ARCH)' in environment for make test. + + -- Gerrit Pape Tue, 20 Apr 2010 23:41:04 +0000 + +git (1:1.7.1~rc1-1.1) experimental; urgency=low + + * debian/control: typo (thx Jonathan Nieder). + * debian/git-daemon-run.postinst: remove fixup for #522348. + + -- Gerrit Pape Sun, 11 Apr 2010 23:22:46 +0000 + +git (1:1.7.1~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Sun, 11 Apr 2010 15:28:28 +0000 + +git (1:1.7.0.4-2) unstable; urgency=low + + * debian/rules: package git: no longer install /usr/share/doc/git-core + -> git symlink; git-core: no longer install /usr/lib/git-core -> git + symlink (closes: #576906). + * debian/control: package git: Replaces:, Conflicts: git-core (<= + 1:1.7.0.4-1). + * debian/rules: make /usr/share/gitweb/index.cgi -> + ../../lib/cgi-bin/gitweb.cgi symlink relative (lintian). + * debian/control: package git-core: minor update to the long + description. + * debian/git.README.source: add note about the + mailing list. + * debian/rules: target binary-indep: add missing dependency to + git-core.deb-DEBIAN. + * debian/implicit: no longer create DEBIAN/md5sums. + * debian/rules: revert the /usr/lib/git-core -> /usr/lib/git rename + (keeping upstream's default). + + -- Gerrit Pape Sat, 10 Apr 2010 23:16:54 +0000 + +git (1:1.7.0.4-2~exp0) experimental; urgency=low + + [ Gerrit Pape ] + * debian/control, debian/rules, debian/git-core.*: change source and + binary package name from git-core to git; keep now obsolete empty + git-core package that depends on git for upgrade (see + http://lists.debian.org/debian-devel/2009/09/thrd2.html#00661). + * debian/control: package git: Replaces: git-core, Conflicts: git-core + (<= 1:1.7.0.3-1), Provides: git-core. + * debian/git.NEWS.Debian: talk about the package name change, and the + possible hazzle when upgrading with GNU Interactive Tools installed + since etch and no git-core installed. + * debian/control, debian/rules: new package git-all: dummy package + which brings in all subpackages (following upstream's RPMs). + + [ Jonathan Nieder ] + * debian/git.README.source: adjust for the package name change. + * debian/rules: install symbolic link git -> git-core in /usr/lib + to simplify upgrades. + * debian/git-daemon/run: use $(git --exec-path) instead of hard-coding + the path to the git-daemon binary. + + -- Gerrit Pape Sat, 03 Apr 2010 15:07:19 -0500 + +git-core (1:1.7.0.4-1) unstable; urgency=low + + * debian/git-daemon-run.postrm: purge: don't warn if the git-daemon + service is already removed; use -f option to userdel, on fast-purge + the log service daemon might still run for a short time (closes: + #575434). + * new upstream point release. + + -- Gerrit Pape Thu, 01 Apr 2010 20:42:19 +0000 + +git-core (1:1.7.0.3-1) unstable; urgency=low + + * debian/control: Standards-Version: 3.8.4.0. + * debian/changelog: note fixes from Jonathan Nieder in 1.7.0.2-1. + * new upstream point release. + + -- Gerrit Pape Mon, 22 Mar 2010 09:19:06 +0000 + +git-core (1:1.7.0.2-1) unstable; urgency=low + + * new upstream point release. + + [ Jonathan Nieder ] + * am: remove rebase-apply directory before gc (thx Mark Brown, + closes: #570966). + * git-imap-send: Convert LF to CRLF before storing patch to draft box + (closes: #572598). + * sha1_file: be paranoid when creating loose objects (closes: + #569505). + + -- Gerrit Pape Thu, 18 Mar 2010 20:44:12 +0000 + +git-core (1:1.7.0-1) unstable; urgency=low + + * debian/git-core.README.source: typos. + * new upstream release. + * Documentation: Update git core tutorial clarifying reference to + scripts (closes: ##560795). + * merge branch debian-experimental. + + -- Gerrit Pape Tue, 16 Feb 2010 08:51:32 +0000 + +git-core (1:1.7.0~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Fri, 12 Feb 2010 14:30:12 +0000 + +git-core (1:1.7.0~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + remove; applied upstream. + * debian/rules: NO_PYTHON=1. Packaging the git_remote_helpers + Python module will require more work. + * update debian/copyright (closes: #557065). + * debian/rules: set prefix=/usr when building man pages (closes: + #567404). + + -- Jonathan Nieder Sat, 30 Jan 2010 17:46:04 -0600 + +git-core (1:1.6.6.2-1) unstable; urgency=medium + + * new upstream point release. + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + remove; applied upstream. + * debian/rules: stop ignoring test suite failures on ia64, since + #563882 has been fixed. Build-Depends: and Depends: + libc6.1 (>= 2.10.2-6) [ia64] for the fix (closes: #568915). + * update debian/copyright (closes: #557065). + * debian/rules: set prefix=/usr when building man pages (closes: + #567404). + + -- Jonathan Nieder Thu, 11 Feb 2010 21:48:55 -0600 + +git-core (1:1.6.6.1-1) unstable; urgency=low + + [ Gerrit Pape ] + * new upstream point release. + * Document git-blame triple -C option (thx Ramkumar Ramachandra, + closes: #476604). + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + new; git-cvsserver: allow regex metacharacters in CVSROOT (fixes + build/selftest failure if the build directory pathname contains a +). + * debian/gitweb.apache2.conf, debian/gitweb.postinst: new; make gitweb + work out of the box with Apache (thx Charles Plessy). + * debian/gitweb.README.Debian, debian/gitweb.conf, debian/rules: make + gitweb work out of the box with Apache (thx Charles Plessy, closes: + #497809). + * debian/gitweb.conffiles: add /etc/apache2/conf.d/gitweb. + + [ Jonathan Nieder ] + * debian/rules: ignore test suite failures on ia64 (workaround: + #563882). + + -- Gerrit Pape Wed, 27 Jan 2010 13:30:29 +0000 + +git-core (1:1.6.6-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Mon, 04 Jan 2010 16:01:36 +0000 + +git-core (1:1.6.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Thu, 17 Dec 2009 10:13:09 +0000 + +git-core (1:1.6.5.7-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 17 Dec 2009 09:39:55 +0000 + +git-core (1:1.6.6~rc1-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + -- Gerrit Pape Fri, 04 Dec 2009 00:17:27 +0000 + +git-core (1:1.6.5.4-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 03 Dec 2009 22:48:57 +0000 + +git-core (1:1.6.6~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0001-bug-369742-pager.c-fallback-to-pager-...diff, + debian/diff/0002-bug-438793-494505-fallback-to-editor-...diff, + debian/diff/0004-bug-477337-git-svn.perl-fallback-to...diff: + remove; obsolete. + * debian/rules: add DEFAULT_PAGER=pager, DEFAULT_EDITOR=editor to + OPTS. + + -- Gerrit Pape Thu, 26 Nov 2009 00:17:59 +0000 + +git-core (1:1.6.5.3-1) unstable; urgency=low + + [ Tanguy Ortolo ] + * debian/git-core.README.Debian, debian/control: git-daemon-run: + document that git-daemon is not provided by this package; add hint + on how to enable git-daemon through inetd(8) (closes: #554215). + + [ Jonathan Nieder ] + * debian/rules: drop misleading PPC_SHA1, ARM_SHA1 settings (closes: + #555039). + * debian/rules: log $(CC) version, not gcc (closes: #555040). + * debian/rules: allow clean as non-root (closes: #555041). + * debian/rules: drop obsolete WITH_P4IMPORT setting (closes: + #555051). + * debian/rules: TCLTK_PATH=wish (closes: #555027). + + [ Gerrit Pape ] + * new upstream point release. + * ls-files: unbreak "ls-files -i" (closes: #553296). + * Require a struct remote in transport_get(); Allow curl helper to + work without a local repository (closes: #553507). + * help -a: do not unnecessarily look for a repository (closes: + #539273). + * thx Jonathan Nieder. + + -- Gerrit Pape Tue, 17 Nov 2009 21:01:46 +0000 + +git-core (1:1.6.5.2-1) unstable; urgency=low + + * restore temporary lost changes from version 1:1.6.3.3-2 (closes: + #530693). + * new upstream point release. + * grep: do not segfault when -f is used (closes: 551071). + + -- Gerrit Pape Mon, 26 Oct 2009 12:05:18 +0000 + +git-core (1:1.6.5-1) unstable; urgency=low + + * new upstream release. + * git-doc: html no longer uses "{plus}" where it should be "+" + (closes: #529255). + * debian/git-core.README.source: new; document how to use the + Debian package source. + * debian/implicit: update to revision 60d9070. + + -- Gerrit Pape Tue, 13 Oct 2009 00:23:00 +0000 + +git-core (1:1.6.4.3-1) unstable; urgency=low + + * new upstream release (closes: #546709). + * git-cvsserver: no longer use deprecated 'git-subcommand' commands + (closes: #536067). + * branch debian-sid: git cherry-pick 098082f, 318b847, 1f9b620 (thx + Anders Kaseorg; closes: #546499). + + -- Gerrit Pape Wed, 16 Sep 2009 11:03:45 +0000 + +git-core (1:1.6.3.3-2) unstable; urgency=low + + [ Anders Kaseorg ] + * Fix manpage formatting: set ASCIIDOC_NO_ROFF instead of + DOCBOOK_XSL_173 (based on the instructions in Documentation/Makefile) + and don’t override the internal Makefile variable ASCIIDOC_EXTRA + (closes: #530693, #521954, #533320). + + [ Gerrit Pape ] + * debian/control: Standards-Version: 3.8.2.0. + + -- Gerrit Pape Mon, 29 Jun 2009 00:06:59 +0000 + +git-core (1:1.6.3.3-1) unstable; urgency=high + + * new upstream point release. + * daemon: Strictly parse the "extra arg" part of the command + (closes: #532935; CVE-2009-2108). + * debian/rules: add NO_CROSS_DIRECTORY_HARDLINKS=1 to OPTS. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + remove; obsolete. + + -- Gerrit Pape Tue, 23 Jun 2009 08:49:17 +0000 + +git-core (1:1.6.3.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 14 May 2009 21:35:01 +0000 + +git-core (1:1.6.3-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Fri, 08 May 2009 07:57:39 +0000 + +git-core (1:1.6.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Wed, 29 Apr 2009 21:58:10 +0000 + +git-core (1:1.6.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Mon, 20 Apr 2009 21:44:09 +0000 + +git-core (1:1.6.2.4-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 20 Apr 2009 20:22:02 +0000 + +git-core (1:1.6.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 14 Apr 2009 23:06:38 +0000 + +git-core (1:1.6.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: Standards-Version: 3.8.1.0. + * debian/control: change subversion to Subversion in description. + * debian/control: Section: vcs (except for git-doc). + + -- Gerrit Pape Tue, 14 Apr 2009 22:46:43 +0000 + +git-core (1:1.6.2.2-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + new; Makefile: do not install cross-directory hardlink (thx Jonathan + Nieder, closes: #520116). + * debian/git-daemon/run: run /usr/lib/git-core/git-daemon instead of + 'git daemon' (closes: #522348). + * debian/git-daemon-run.postinst: on upgrade from >> 1:1.6.0, fixup + #522348. + * debian/git-core.emacsen-startup: remove the line + '(add-to-list 'vc-handled-backends 'git)' (closes: #519728). + + -- Gerrit Pape Sun, 05 Apr 2009 20:49:25 +0000 + +git-core (1:1.6.2.1-1) unstable; urgency=low + + * new upstream point release. + * debian/git-core.emacsen-startup: no longer refer to vc-git.el + (closes: #519728). + + -- Gerrit Pape Mon, 16 Mar 2009 22:18:05 +0000 + +git-core (1:1.6.2-1) unstable; urgency=medium + + * new upstream release. + * merge branch debian-experimental. + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff, + debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 04 Mar 2009 22:44:43 +0000 + +git-core (1:1.6.2~rc2-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + -- Gerrit Pape Thu, 26 Feb 2009 22:15:13 +0000 + +git-core (1:1.6.1.3-2) unstable; urgency=high + + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff: + new from upstream git: Install builtins with the user and group of + the installing personality. + * debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + new from upstream git: git-quiltimport: preserve standard input to + be able to read user input (closes: #515910). + + -- Gerrit Pape Thu, 26 Feb 2009 22:01:37 +0000 + +git-core (1:1.6.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/git-core.docs, debian/git-doc.docs, debian/rules: move + Documentation/RelNotes* from git-doc to the git-core package + (closes: #514866). + + -- Gerrit Pape Tue, 17 Feb 2009 20:20:03 +0000 + +git-core (1:1.6.2~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 10 Feb 2009 00:06:02 +0000 + +git-core (1:1.6.1.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 09 Feb 2009 21:31:39 +0000 + +git-core (1:1.6.1.2-1) experimental; urgency=low + + * new upstream release. + * don't fail to clone over http if connection is rate limited + (closes: #512795). + * git svn info no longer fails (closes: #499243). + * debian/rules: ASCIIDOC_EXTRA='-a asciidoc7compatible -a docbook-xsl-172' + and DOCBOOK_XSL_173=Yes when building documentation (thx Niko Tyni + for the patch, closes: #497883). + * merge branch debian-lenny. + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + remove; fixed upstream. + + -- Gerrit Pape Mon, 02 Feb 2009 23:26:45 +0000 + +git-core (1:1.5.6.5-3) unstable; urgency=high + + * debian/rules: no longer install symlink /etc/init.d/git-daemon -> + /usr/bin/sv (closes: #511687). + * debian/git-daemon-run.README.Debian: document how to create the + symlink manually to have an LSB compatible /etc/init.d/git-daemon + interface to control the service. + + -- Gerrit Pape Mon, 02 Feb 2009 20:56:15 +0000 + +git-core (1:1.6.0.6-1) experimental; urgency=low + + * debian/control: git-email: Recommends: libnet-smtp-ssl-perl, + libauthen-sasl-perl (thx Kees Cook, closes: #505636). + * debian/diff/0005-bug-506445-hooks-post-receive-email-set-...diff: + new; hooks/post-receive-email: set encoding to utf-8 (thx Alexander + Gerasiov, closes: #506445). + * new upstream point release (closes: #504641). + * gitweb: do not run "git diff" that is Porcelain. + + -- Gerrit Pape Sat, 20 Dec 2008 11:03:49 +0000 + +git-core (1:1.5.6.5-2) unstable; urgency=high + + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + new; fix possible gitweb vulnerability: calling "git diff": Jakub + says that legacy-style URI to view two blob differences are never + generated since 1.4.3. This codepath runs "git diff" Porcelain from + the gitweb, which is a no-no. It can trigger diff.external command + that is specified in the configuration file of the repository being + viewed. + + -- Gerrit Pape Wed, 17 Dec 2008 09:27:01 +0000 + +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.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-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-1.7.1.orig/debian/gitweb.docs +++ git-1.7.1/debian/gitweb.docs @@ -0,0 +1 @@ +gitweb/README --- git-1.7.1.orig/debian/gitweb.NEWS.Debian +++ git-1.7.1/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-1.7.1.orig/debian/git.README.Debian +++ git-1.7.1/debian/git.README.Debian @@ -0,0 +1,71 @@ +git-core for Debian +------------------- + +When setting up a git.example.org server, there are several things to +configure to make everything work nicely together. All this is optional. + +1. Run a git-daemon. This allows people to use a git:// URL to access your +repositories. This package provides the git-daemon program, to enable a +git-daemon service, configure inetd(8) to launch it on demand, or install the +git-daemon-run package to run it permanently: + cat >> /etc/inetd.conf < + ServerName git.example.org + ServerAdmin webmaster@example.org + HeaderName HEADER + # bogus but safe DocumentRoot + DocumentRoot /var/cache/git + ErrorLog /var/log/apache-ssl/git.example.org-error.log + CustomLog /var/log/apache-ssl/git.example.org-access.log combined + Alias /robots.txt /var/www/cvs.robots.txt + Alias /gitweb.css /usr/share/gitweb/gitweb.css + Alias /git-favicon.png /usr/share/gitweb/git-favicon.png + Alias /git-logo.png /usr/share/gitweb/git-logo.png + Alias /git /var/cache/git + ScriptAlias / /usr/lib/cgi-bin/gitweb.cgi + RedirectMatch permanent "^/~(.*)$" "http://example.org/~$1" + + +Now git-clone http://git.example.org/git/repo will work. And if you +installed the gitweb package, http://git.example.org/ now will display a +list of repositories, making them accessible through a web browser. + + -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 --- git-1.7.1.orig/debian/changelog.upstream.sh +++ git-1.7.1/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-1.7.1.orig/debian/gitweb.conf +++ git-1.7.1/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/gitweb.css"; + +# logo to use +$logo = "/gitweb/git-logo.png"; + +# the 'favicon' +$favicon = "/gitweb/git-favicon.png"; --- git-1.7.1.orig/debian/git-daemon-run.postrm +++ git-1.7.1/debian/git-daemon-run.postrm @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +sv force-stop git-daemon 2>/dev/null || : +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 -f gitlog +echo 'deluser program not available, not removing system user "gitlog".' >&2 --- git-1.7.1.orig/debian/gitweb.conffiles +++ git-1.7.1/debian/gitweb.conffiles @@ -0,0 +1,2 @@ +/etc/gitweb.conf +/etc/apache2/conf.d/gitweb --- git-1.7.1.orig/debian/git.emacsen-startup +++ git-1.7.1/debian/git.emacsen-startup @@ -0,0 +1,144 @@ +;; -*-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 '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-1.7.1.orig/debian/git.NEWS.Debian +++ git-1.7.1/debian/git.NEWS.Debian @@ -0,0 +1,34 @@ +git (1:1.7.0.4-2~exp0) experimental; urgency=low + + The Debian package 'git-core' has been renamed to 'git'. Before + Debian version 5.0 (codenamed "lenny"), the 'git' package provided + the GNU Interactive Tools, and in the lenny release, it was renamed + to 'gnuit', leaving the 'git' package as a transitional dummy + package. + + If the GNU Interactive Tools package was installed with Debian + version 4.0 (etch) or earlier on this system, the new 'git' package + (a content addressable filesystem) may be installed on upgrade, even + though it was not installed before. + + In this case, sorry for the hassle. Simply remove the new 'git' + package again if you're not interested in it: + + # apt-get remove --purge git + + -- Gerrit Pape Sun, 21 Mar 2010 22:12:01 +0000 + +git-core (1:1.6.0-1) experimental; urgency=low + + Most of the programs are now installed outside the default $PATH, + except for "git", "gitk" and some server side programs that need + to be accessible for technical reasons. Invoking a git subcommand + as "git-xyzzy" from the command line has been deprecated since + early 2006 (and officially announced in the 1.5.4 release notes); + using the "git-xyzzy" form in scripts after adding the output from + "git --exec-path" to the $PATH is still supported in this release, + but users are again strongly encouraged to adjust their scripts to + use the "git xyzzy" form, as this support might be dropped in later + releases. + + -- Gerrit Pape Sun, 24 Aug 2008 22:31:44 +0000 --- git-1.7.1.orig/debian/git-doc.docs +++ git-1.7.1/debian/git-doc.docs @@ -0,0 +1,2 @@ +tmp/html/* +Documentation/technical --- git-1.7.1.orig/debian/git-daemon-run.prerm +++ git-1.7.1/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-1.7.1.orig/debian/changelog.upstream +++ git-1.7.1/debian/changelog.upstream @@ -0,0 +1,24317 @@ +Version v1.7.1; changes since v1.7.1-rc1: +----------------------------------------- + +Charles Bailey (1): + Documentation: Describe other situations where -z affects git diff + +Chris Webb (1): + git-instaweb: pass through invoking user's path to gitweb CGI scripts + +Eric Raymond (1): + Documentation improvements for the description of short format. + +Jay Soffian (1): + Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 + +Jeff King (2): + diff: use large integers for diffstat calculations + rebase-interactive: silence warning when no commits rewritten + +Jens Lehmann (2): + gitk: Add Ctrl-W shortcut for closing the active window + gitk: Display dirty submodules correctly + +Johannes Gilger (1): + pretty: Initialize notes if %N is used + +Johannes Sixt (2): + Windows: start_command: Support non-NULL dir in struct child_process + MSVC: Fix build by adding missing termios.h dummy + +Jonathan Nieder (6): + gitk: Add comments to explain encode_view_opts and decode_view_opts + gitk: Don't clobber "Remember this view" setting + Add .depend directories to .gitignore + Document new "already-merged" rule for branch -d + tag -v: use RUN_GIT_CMD to run verify-tag + Documentation/Makefile: fix interrupted builds of user-manual.xml + +Junio C Hamano (8): + SubmittingPatches: update GMail section + blame documentation: -M/-C notice copied lines as well as moved ones + Git 1.7.0.5 + gitweb: simplify gitweb.min.* generation and clean-up rules + t3301: add tests to use --format="%N" + Git 1.7.1-rc2 + Git 1.7.0.6 + Git 1.7.1 + +Marc Branchaud (1): + Docs: Add -X option to git-merge's synopsis. + +Mark Hills (4): + gitk: Remove forced use of sans-serif font + gitk: Set the font for all spinbox widgets + gitk: Set the font for all listbox widgets + gitk: Use consistent font for all text input fields + +Matthew Ogilvie (1): + t6006: do not write to /tmp + +Michael J Gruber (2): + t1010-mktree: Adjust expected result to code and documentation + t7012: Mark missing tests as TODO + +Pat Thoyts (3): + gitk: Avoid calling tk_setPalette on Windows + gitk: Add emacs editor variable block + gitk: Fix display of copyright symbol + +Ramkumar Ramachandra (5): + Documentation/remote-helpers: Rewrite description + Documentation/urls: Rewrite to accomodate ::
+ Documentation/remote-helpers: Add invocation section + Fixup: Second argument may be any arbitrary string + Documentation/remote-helpers: Fix typos and improve language + +SZEDER Gábor (1): + reflog: remove 'show' from 'expire's usage string + +Stephen Boyd (1): + t3507: Make test executable + +Thomas Rast (1): + combined diff: correctly handle truncated file + +Will Palmer (1): + documentation: clarify direction of core.autocrlf + + +Version v1.7.1-rc1; changes since v1.7.0.5: +------------------------------------------- + +Aaron Crane (1): + cvsimport: new -R option: generate .git/cvs-revisions mapping + +Anders Kaseorg (1): + everyday: fsck and gc are not everyday operations + +Ben Walton (2): + Make templates honour SHELL_PATH and PERL_PATH + Modernize git calling conventions in hook templates + +Benjamin C Meyer (1): + Fix a spelling mistake in a git-p4 console message + +Bert Wesarg (4): + make union merge an xdl merge favor + refactor merge flags into xmparam_t + merge-file: add option to specify the marker size + merge-file: add option to select union merge favor + +Brandon Casey (10): + t/t1304: avoid -d option to setfacl + t/t1304: set the Default ACL base entries + t/t1304: use 'test -r' to test readability rather than looking at mode bits + t/t1304: set the ACL effective rights mask + t/t1304: make a second colon optional in the mask ACL check + notes.c: remove inappropriate call to return + t5505: remove unnecessary subshell invocations + t5505: add missing && + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob + notes.h: declare bit field as unsigned to silence compiler complaints + +Brian Gernhardt (1): + Use test_expect_success for test setups + +Chris Webb (1): + imap-send: suppress warning about cleartext password with CRAM-MD5 + +Christian Couder (8): + reset: add option "--keep" to "git reset" + reset: add test cases for "--keep" option + Documentation: reset: describe new "--keep" option + reset: disallow "reset --keep" outside a work tree + reset: disallow using --keep when there are unmerged entries + cherry-pick: add tests for new --ff option + Documentation: describe new cherry-pick --ff option + rebase -i: use new --ff cherry-pick option + +Dave Olszewski (1): + rebase--interactive: don't require what's rebased to be a branch + +David Aguilar (1): + Makefile: Remove usage of deprecated Python "has_key" method + +Eric Blake (1): + Makefile: update defaults for modern Cygwin + +Eric Raymond (1): + Integrate version 3 ciabot scripts into contrib/. + +Erik Faye-Lund (5): + hash-object: support --stdin-paths with --no-filters + git-svn: support fetch with autocrlf on + Revert "git-svn: always initialize with core.autocrlf=false" + cherry: support --abbrev option + ls: remove redundant logic + +Frank Li (3): + fallback SSH_ASKPASS when GIT_ASKPASS not set + git-svn: Support retrieving passwords with GIT_ASKPASS + git-core: Support retrieving passwords with GIT_ASKPASS + +Hitoshi Mitake (1): + imap-send: support CRAM-MD5 authentication + +Ian Ward Comfort (1): + RPM spec: include bash completion support + +Ilari Liusvaara (1): + Allow '+', '-' and '.' in remote helper names + +Jakub Narebski (2): + gitweb: esc_html (short) error message in die_error + gitweb: Protect escaping functions against calling on undef + +Jari Aalto (3): + git-send-email.perl: improve error message in send_message() + git-send-email.perl: add option --smtp-debug + git-send-email.perl - try to give real name of the calling host to HELO/EHLO + +Jeff King (4): + submodule summary: do not shift a non-existent positional variable + fix const-correctness of write_sha1_file + fix textconv leak in emit_rewrite_diff + fix typos and grammar in 1.7.1 draft release notes + +Jens Lehmann (7): + git diff --submodule: Show detailed dirty status of submodules + git status: Show detailed dirty status of submodules in long format + git submodule summary: Handle HEAD as argument when on an unborn branch + Refactor dirty submodule detection in diff-lib.c + git status: Fix false positive "new commits" output for dirty submodules + git status: ignoring untracked files must apply to submodules too + Teach diff --submodule and status to handle .git files in submodules + +Johan Herland (32): + Minor cosmetic fixes to notes.c + Notes API: get_commit_notes() -> format_note() + remove the commit restriction + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef + Notes API: init_notes(): Initialize the notes tree from the given notes ref + Notes API: add_note(): Add note objects to the internal notes tree structure + Notes API: remove_note(): Remove note objects from the notes tree structure + Notes API: get_note(): Return the note annotating the given object + Notes API: for_each_note(): Traverse the entire notes tree with a callback + Notes API: write_notes_tree(): Store the notes tree in the database + Notes API: Allow multiple concurrent notes trees with new struct notes_tree + Refactor notes concatenation into a flexible interface for combining notes + Builtin-ify git-notes + t3301: Verify successful annotation of non-commits + t3305: Verify that adding many notes with git-notes triggers increased fanout + Teach notes code to properly preserve non-notes in the notes tree + Teach builtin-notes to remove empty notes + builtin-notes: Add "remove" subcommand for removing existing notes + t3305: Verify that removing notes triggers automatic fanout consolidation + Notes API: prune_notes(): Prune notes that belong to non-existing objects + builtin-notes: Add "prune" subcommand for removing notes for missing objects + Documentation: Generalize git-notes docs to 'objects' instead of 'commits' + builtin-notes: Add "list" subcommand for listing note objects + builtin-notes: Add --message/--file aliases for -m/-F options + builtin-notes: Add "add" subcommand for adding notes to objects + builtin-notes: Add "append" subcommand for appending to note objects + builtin-notes: Deprecate the -m/-F options for "git notes edit" + builtin-notes: Refactor handling of -F option to allow combining -m and -F + builtin-notes: Add -c/-C options for reusing notes + builtin-notes: Misc. refactoring of argc and exit value handling + builtin-notes: Add "copy" subcommand for copying notes between objects + submodule summary: Don't barf when invoked in an empty repo + builtin-notes: Minor (mostly parse_options-related) fixes + +Johannes Sixt (2): + Print RUNTIME_PREFIX warning only when GIT_TRACE is set + Windows: redirect f[re]open("/dev/null") to f[re]open("nul") + +Jonathan Nieder (34): + Makefile: add missing header file dependencies + Makefile: make sure test helpers are rebuilt when headers change + Makefile: remove wt-status.h from LIB_H + Makefile: clean up http-walker.o dependency rules + Makefile: drop dependency on $(wildcard */*.h) + Makefile: transport.o depends on branch.h now + Makefile: rearrange dependency rules + Makefile: disable default implicit rules + Makefile: list generated object files in OBJECTS + Makefile: lazily compute header dependencies + Makefile: list standalone program object files in PROGRAM_OBJS + Teach Makefile to check header dependencies + Do not install shell libraries executable + Makefile: tuck away generated makefile fragments in .depend + Makefile: always remove .depend directories on 'make clean' + Makefile: clarify definition of TEST_OBJS + Makefile: Fix occasional GIT-CFLAGS breakage + revert: fix tiny memory leak in cherry-pick --ff + tests: document format of conflicts from checkout -m + tests: document cherry-pick behavior in face of conflicts + xdl_merge(): add optional ancestor label to diff3-style output + xdl_merge(): move file1 and file2 labels to xmparam structure + merge-file --diff3: add a label for ancestor + ll_merge(): add ancestor label parameter for diff3-style output + checkout --conflict=diff3: add a label for ancestor + merge_file(): add comment explaining behavior wrt conflict style + merge_trees(): add ancestor label parameter for diff3-style output + checkout -m --conflict=diff3: add a label for ancestor + compat: add mempcpy() + revert: clarify label on conflict hunks + cherry-pick, revert: add a label for ancestor + merge-recursive: add a label for ancestor + Makefile: future-proof Cygwin version check + Teach mailinfo %< as an alternative scissors mark + +Junio C Hamano (27): + builtin-for-each-ref.c: comment fixes + builtin-for-each-ref.c: check if we need to peel onion while parsing the format + for-each-ref --format='%(symref) %(symref:short)' + for-each-ref --format='%(flag)' + Start 1.7.1 cycle + Resurrect "git grep --no-index" + Update draft release notes to 1.7.1 + notes: fix malformed tree entry + wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR + submodule summary: do not fail before the first commit + parse-options: add parse_options_concat() to concat options + builtin/merge: make checkout_fast_forward() non static + revert: add --ff option to allow fast forward when cherry-picking + Update draft release notes to 1.7.1 + Documentation: improve description of "git reset --keep" + t4013: add tests for log -p -m --first-parent + revision: introduce setup_revision_opt + show -c: show patch text + show --first-parent/-m: do not default to --cc + Makefile: update check-docs target + t5516: Use test_cmp when appropriate + Update draft release notes to 1.7.1 + Update draft release notes to 1.7.1 + Revert "Link against libiconv on IRIX" + Git 1.7.1-rc0 + diff.c: work around pointer constness warnings + Git 1.7.1-rc1 + +Larry D'Anna (4): + git-push: fix an advice message so it goes to stderr + git-push: send "To " messages to the standard output in --porcelain mode + git-push: make git push --porcelain print "Done" + git-push: add tests for git push --porcelain + +Linus Torvalds (1): + Move 'builtin-*' into a 'builtin/' subdirectory + +Marc Branchaud (1): + Teach rebase the --no-ff option. + +Mark Lodato (4): + Add an optional argument for --color options + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* + grep: Colorize filename, line number, and separator + grep: Colorize selected, context, and function lines + +Mark Rada (6): + Gitweb: add ignore and clean rules for minified files + Gitweb: add support for minifying gitweb.css + Gitweb: add autoconfigure support for minifiers + instaweb: add minification awareness + gitweb: add documentation to INSTALL regarding gitweb.js + gitweb: update INSTALL to use shorter make target + +Markus Heidelberg (2): + builtin/commit: fix duplicated sentence in a comment + builtin/commit: remove unnecessary variable definition + +Michael J Gruber (7): + git-svn: req_svn when needed + t9119-git-svn-info.sh: test with svn 1.6.* as well + Documentation: fix a few typos in git-notes.txt + git-svn: make git svn --version work again + rev-list: use default abbrev length when abbrev-commit is in effect + t3301-notes: Test the creation of reflog entries + refs.c: Write reflogs for notes just like for branch heads + +Michael Lukashov (4): + connect.c: move duplicated code to a new function 'get_host_and_port' + refactor duplicated code in builtin-send-pack.c and transport.c + refactor duplicated fill_mm() in checkout and merge-recursive + refactor duplicated encode_header in pack-objects and fast-import + +Michele Ballabio (1): + shortlog: warn the user when there is no input + +Miklos Vajna (1): + request-pull: avoid mentioning that the start point is a single commit + +Nguyễn Thái Ngọc Duy (5): + make_absolute_path(): Do not append redundant slash + init-db, rev-parse --git-dir: do not append redundant slash + Move offset_1st_component() to path.c + Support working directory located at root + Add test for using Git at root of file system + +Nicolas Pitre (1): + move encode_in_pack_object_header() to a better place + +Petr Baudis (1): + git log -p -m: document -m and honor --first-parent + +René Scharfe (2): + setenv(GIT_DIR) clean-up + grep: enable threading for context line printing + +SZEDER Gábor (4): + bash: improve aliased command recognition + bash: support user-supplied completion scripts for user's git commands + bash: support user-supplied completion scripts for aliases + bash: completion for gitk aliases + +Stefan-W. Hahn (4): + documentation: 'git-mailsplit --keep-cr' is not hidden anymore + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit + git-am: Add am.keepcr and --no-keep-cr to override it + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` + +Stephen Boyd (11): + format-patch: use a string_list for headers + format-patch: add --no-cc, --no-to, and --no-add-headers + send-email: add --no-cc, --no-to, and --no-bcc + notes: rework subcommands and parse options + fmt-merge-msg: be quiet if nothing to merge + t6200: modernize with test_tick + t6200: test fmt-merge-msg more + fmt-merge-msg: use pretty.c routines + string-list: add unsorted_string_list_lookup() + fmt-merge-msg: remove custom string_list implementation + fmt-merge-msg: hide summary option + +Steven Drake (5): + Add `init.templatedir` configuration variable. + Add a "TEMPLATE DIRECTORY" section to git-init[1]. + init: having keywords without value is not a global error. + t/t0001-init.sh: add test for 'init with init.templatedir set' + Add 'git format-patch --to=' option and 'format.to' configuration variable. + +Tay Ray Chuan (17): + Documentation/git-clone: mention progress in -v + Documentation/git-pull: put verbosity options before merge/fetch ones + Documentation/git-push: put --quiet before --verbose + fetch: refactor verbosity option handling into transport.[ch] + push: support multiple levels of verbosity + clone: support multiple levels of verbosity + transport->progress: use flag authoritatively + push: learn --progress + fetch and pull: learn --progress + transport: update flags to be in running order + t5541-http-push: check that ref is unchanged for non-ff test + t554[01]-http-push: refactor, add non-ff tests + http-push: remove "|| 1" to enable verbose check + http-walker: cleanup more thoroughly + http: init and cleanup separately from http-walker + remote-curl: use http_fetch_ref() instead of walker wrapper + remote-curl: init walker only when needed + +Thomas Rast (14): + test-lib: unset GIT_NOTES_REF to stop it from influencing tests + Support showing notes from more than one notes tree + Documentation: document post-rewrite hook + commit --amend: invoke post-rewrite hook + rebase: invoke post-rewrite hook + rebase -i: invoke post-rewrite hook + notes: implement 'git notes copy --stdin' + notes: implement helpers needed for note copying during rewrite + rebase: support automatic notes copying + commit --amend: copy notes to the new commit + notes: add shorthand --ref to override GIT_NOTES_REF + notes: track whether notes_trees were changed at all + git-notes(1): add a section about the meaning of history + rebase -i: make post-rewrite work for 'edit' + +Tuomas Suutari (5): + t9151: Fix a few commits in the SVN dump + t9151: Add two new svn:mergeinfo test cases + git-svn: Fix discarding of extra parents from svn:mergeinfo + git-svn: Fix merge detecting with rewrite-root + t9150,t9151: Add rewrite-root option to init + +YONETANI Tomokazu (1): + Fix _XOPEN_SOURCE problem on DragonFly + +josh robb (1): + git svn: delay importing SVN::Base until it is needed + + +Version v1.7.0.5; changes since v1.7.0.4: +----------------------------------------- + +Brandon Casey (1): + daemon.c: avoid accessing ss_family member of struct sockaddr_storage + +Erik Faye-Lund (1): + rev-list: fix --pretty=oneline with empty message + +Gustaf Hendeby (1): + Improve error messages from 'git stash show' + +Jeff King (1): + docs: clarify "branch -l" + +Jens Lehmann (1): + Let check_preimage() use memset() to initialize "struct checkout" + +Junio C Hamano (3): + diff --check: honor conflict-marker-size attribute + blame documentation: -M/-C notice copied lines as well as moved ones + Git 1.7.0.5 + +Michael J Gruber (2): + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela + send-email: lazily assign editor variable + +R. Tyler Ballance (1): + Correct references to /usr/bin/python which does not exist on FreeBSD + +Ramkumar Ramachandra (1): + imap-send: Remove limitation on message body + +Shawn O. Pearce (1): + http-backend: Don't infinite loop during die() + +Tay Ray Chuan (4): + pack-protocol.txt: fix spelling + pack-protocol.txt: fix pkt-line lengths + branch: say "Reset to" in reflog entries for 'git branch -f' operations + fetch/push: fix usage strings + + +Version v1.7.0.4; changes since v1.7.0.3: +----------------------------------------- + +Björn Gustavsson (5): + apply: Don't unnecessarily update line lengths in the preimage + apply: Remove the quick rejection test + apply: Allow blank context lines to match beyond EOF + t4124: Add additional tests of --whitespace=fix + t3417: Add test cases for "rebase --whitespace=fix" + +Chris Packham (1): + test for add with non-existent pathspec + +David Aguilar (1): + difftool: Fix '--gui' when diff.guitool is unconfigured + +Greg Bacon (1): + Documentation: Clarify support for smart HTTP backend + +Holger Weiß (3): + Don't redefine htonl and ntohl on big-endian + Link against libiconv on IRIX + Documentation: show-ref s are optional + +Jakub Narebski (1): + gitweb: git_get_project_config requires only $git_dir, not also $project + +Jan Stępień (1): + Updated the usage string of git reset + +Jeff King (1): + dir: fix COLLECT_IGNORED on excluded prefixes + +Johannes Sixt (2): + diff: fix textconv error zombies + Windows: fix utime() for read-only files + +Junio C Hamano (8): + git add -u: die on unmatched pathspec + color: allow multiple attributes + t0050: mark non-working test as such + tests for "git add ignored-dir/file" without -f + refs: ref entry with NULL sha1 is can be a dangling symref + t9350: fix careless use of "cd" + Prepare for 1.7.0.4 + Git 1.7.0.4 + +Kevin Ballard (1): + format-patch: Squelch 'fatal: Not a range." error + +Markus Heidelberg (1): + Documentation: explain the meaning of "-g" in git-describe output + +Sverre Rabbelier (1): + fast-export: don't segfault when marks file cannot be opened + + +Version v1.7.0.3; changes since v1.7.0.2: +----------------------------------------- + +Adam Simpkins (2): + prune: honor --expire=never + reflog: honor gc.reflogexpire=never + +Andreas Gruenbacher (3): + fetch: Check for a "^{}" suffix with suffixcmp() + fetch: Future-proof initialization of a refspec on stack + fetch: Fix minor memory leak + +Dave Olszewski (1): + don't use default revision if a rev was specified + +Filippo Negroni (1): + Fix gitmkdtemp: correct test for mktemp() return value + +Giuseppe Bilotta (5): + Refactor list of of repo-local env vars + rev-parse: --local-env-vars option + shell setup: clear_local_git_env() function + submodules: ensure clean environment when operating in a submodule + is_submodule_modified(): clear environment properly + +Ian Ward Comfort (1): + bash: complete *_HEAD refs if present + +Imre Deak (1): + daemon: parse_host_and_port SIGSEGV if port is specified + +Jeff King (2): + add-interactive: fix bogus diff header line ordering + push: fix segfault for odd config + +Jonathan Nieder (1): + Makefile: Fix CDPATH problem + +Junio C Hamano (12): + "log --author=me --grep=it" should find intersection, not union + Reword "detached HEAD" notification + mailinfo: do not strip leading spaces even for a header line + t5521: fix and modernize + builtin-fetch --all/--multi: propagate options correctly + fetch --all/--multiple: keep all the fetched branch information + pack-objects documentation: reword "objects that appear in the standard input" + Merge accumulated fixes to prepare for 1.7.0.3 + t9400: Use test_cmp when appropriate + t/Makefile: remove test artifacts upon "make clean" + Update draft release notes to 1.7.0.3 + Git 1.7.0.3 + +Mark Lodato (4): + grep docs: pluralize "Example" section + grep docs: use AsciiDoc literals consistently + grep docs: --cached and ... are incompatible + grep docs: document --no-index option + +Matthieu Moy (6): + Add a testcase for ACL with restrictive umask. + Move gitmkstemps to path.c + git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. + Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. + git_mkstemps_mode: don't set errno to EINVAL on exit. + Use git_mkstemp_mode instead of plain mkstemp to create object files + +Michael J Gruber (7): + Documentation/git-read-tree: fix table layout + Documentation/git-read-tree: clarify 2-tree merge + Documentation/git-reflog: Fix formatting of command lists + Documentation/gitdiffcore: Remove misleading date in heading + Documentation/urls: Remove spurious example markers + Documentation/git-clone: Transform description list into item list + .mailmap: Map the the first submissions of MJG by e-mail + +Michael Wookey (1): + run-command.c: fix build warnings on Ubuntu + +Nelson Elhage (2): + Documentation: pack-objects: Clarify --local's semantics. + pack-objects documentation: Fix --honor-pack-keep as well. + +René Scharfe (2): + blame: fix indent of line numbers + for_each_recent_reflog_ent(): use strbuf, fix offset handling + +Stephen Boyd (1): + pull: replace unnecessary sed invocation + +Thomas Rast (1): + Documentation: receive.denyCurrentBranch defaults to 'refuse' + + +Version v1.7.0.2; changes since v1.7.0: +--------------------------------------- + +Bert Wesarg (3): + Documentation: mention conflict marker size argument (%L) for merge driver + rerere: fix memory leak if rerere images can't be read + unset GREP_OPTIONS in test-lib.sh + +Christian Couder (1): + bisect: error out when passing bad path parameters + +Dmitry Potapov (1): + hash-object: don't use mmap() for small files + +Erik Faye-Lund (1): + run-command: support custom fd-set in async + +Evan Powers (1): + git-p4: fix bug in symlink handling + +Gabriel Filion (1): + require_work_tree broken with NONGIT_OK + +Hitoshi Mitake (1): + git-imap-send: Convert LF to CRLF before storing patch to draft box + +Jacob Helwig (1): + Documentation: Fix indentation problem in git-commit(1) + +Jakub Narebski (2): + gitweb: Die if there are parsing errors in config file + gitweb: Fix project-specific feature override behavior + +Jeff King (9): + accept "git grep -- pattern" + cherry-pick: rewrap advice message + cherry-pick: refactor commit parsing code + cherry-pick: format help message as strbuf + cherry-pick: show commit name instead of sha1 + cherry-pick: prettify the advice message + dwim_ref: fix dangling symref warning + docs: don't talk about $GIT_DIR/refs/ everywhere + rm: fix bug in recursive subdirectory removal + +Johannes Sixt (1): + t3301-notes: insert a shbang line in ./fake_editor.sh + +Jonathan Nieder (9): + Fix 'git var' usage synopsis + Make 'git var GIT_PAGER' always print the configured pager + git.1: Clarify the behavior of the --paginate option + git svn: Fix launching of pager + am: Fix launching of pager + tests: Add tests for automatic use of pager + t7006-pager: if stdout is not a terminal, make a new one + tests: Fix race condition in t7006-pager + am: remove rebase-apply directory before gc + +Junio C Hamano (12): + t6000lib: Fix permission + lib-patch-mode.sh: Fix permission + Typofixes outside documentation area + Start 1.7.0 maintenance track + Fix use of mutex in threaded grep + Prepare 1.7.0.1 release notes + status: preload index to optimize lstat(2) calls + Update 1.7.0.1 release notes + Git 1.7.0.1 + Start preparing for 1.7.0.2 + Update draft release notes to 1.7.0.2 + Git 1.7.0.2 + +Larry D'Anna (3): + diff: make sure --output=/bad/path is caught + git diff --quiet -w: check and report the status + git-diff: add a test for git diff --quiet -w + +Mark Lodato (2): + grep documentation: clarify what files match + Remove reference to GREP_COLORS from documentation + +Markus Heidelberg (1): + sha1_name: fix segfault caused by invalid index access + +Matt Kraai (1): + commit: quote the user name in the example + +Matthieu Moy (1): + stash: suggest the correct command line for unknown options. + +Michal Sojka (1): + Remove extra '-' from git-am(1) + +Nicolas Pitre (8): + fast-import: start using struct pack_idx_entry + fast-import: use sha1write() for pack data + fast-import: use write_idx_file() instead of custom code + fast-import: make default pack size unlimited + fast-import: honor pack.indexversion and pack.packsizelimit config vars + fast-import: use the diff_delta() max_delta_size argument + sha1_file: don't malloc the whole compressed result when writing out objects + sha1_file: be paranoid when creating loose objects + +Pete Harlan (1): + Remove hyphen from "git-command" in two error messages + +René Scharfe (5): + fix minor memory leak in get_tree_entry() + utf8.c: remove print_wrapped_text() + utf8.c: remove print_spaces() + utf8.c: remove strbuf_write() + utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() + +Shawn O. Pearce (7): + run-command: Allow stderr to be a caller supplied pipe + send-pack: demultiplex a sideband stream with status data + receive-pack: Refactor how capabilities are shown to the client + receive-pack: Wrap status reports inside side-band-64k + receive-pack: Send hook output over side band #2 + t5401: Use a bare repository for the remote peer + receive-pack: Send internal errors over side-band #2 + +Stephen Boyd (2): + Documentation: describe --thin more accurately + t7406: Fix submodule init config tests + +Sylvain Rabot (1): + gitweb multiple project roots documentation + +Tay Ray Chuan (1): + transport: add got_remote_refs flag + +Thomas Rast (3): + stash pop: remove 'apply' options during 'drop' invocation + t1450: fix testcases that were wrongly expecting failure + cherry_pick_list: quit early if one side is empty + + +Version v1.7.0; changes since v1.7.0-rc2: +----------------------------------------- + +Brian Gernhardt (1): + t3902: Protect against OS X normalization + +Jacob Helwig (1): + filter-branch: Fix error message for --prune-empty --commit-filter + +Jay Soffian (1): + blame: prevent a segv when -L given start > EOF + +Jeff King (1): + am: switch --resolved to --continue + +Junio C Hamano (11): + git-add documentation: Fix shell quoting example + Fix parsing of imap.preformattedHTML and imap.sslverify + git-push: document all the status flags used in the output + check-ref-format documentation: fix enumeration mark-up + t8003: check exit code of command and error message separately + Git 1.6.6.2 + Update draft release notes to 1.7.0 one more time + archive documentation: attributes are taken from the tree by default + Re-fix check-ref-format documentation mark-up + Fix typo in 1.6.6.2 release notes + Git 1.7.0 + +Michael J Gruber (1): + Documentation: minor fixes to RelNotes-1.7.0 + +Nicolas Pitre (1): + Revert "pack-objects: fix pack generation when using pack_size_limit" + +SZEDER Gábor (1): + bash: support 'git am's new '--continue' option + +Thomas Rast (1): + Documentation: quote braces in {upstream} notation + + +Version v1.7.0-rc2; changes since v1.7.0-rc1: +--------------------------------------------- + +Andrew Myrick (1): + git-svn: persistent memoization + +Ben Walton (2): + configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM + configure: Allow --without-python + +Björn Gustavsson (1): + bash: support the --autosquash option for rebase + +Brian Gernhardt (2): + t9501: Skip testing load if we can't detect it + t9501: Re-fix max load test + +Christian Stimming (1): + git-gui: Update German translation (12 new or changed strings). + +Dan McGee (1): + Make NO_PTHREADS the sole thread configuration variable + +Emmanuel Trillaud (1): + git-gui: update french translation + +Giuseppe Bilotta (4): + git-gui: handle non-standard worktree locations + git-gui: handle bare repos correctly + git-gui: update shortcut tools to use _gitworktree + git-gui: set GIT_DIR and GIT_WORK_TREE after setup + +Heiko Voigt (1): + git-gui: fix shortcut for menu "Commit/Revert Changes" + +Jakub Narebski (1): + gitweb: Make running t9501 test with '--debug' reliable and usable + +Jeff Epler (1): + git-gui: Support applying a range of changes at once + +Jeff King (3): + mention new shell execution behavior in release notes + docs: fix filter-branch example for quoted paths + Fix invalid read in quote_c_style_counted + +Jens Lehmann (5): + git-gui: Use git diff --submodule when available + git-gui: Add a special diff popup menu for submodules + git-gui: Quote git path when starting another gui in a submodule + Fix memory leak in submodule.c + Updates for dirty submodules in release notes and user manual + +John 'Warthog9' Hawley (7): + gitweb: Load checking + gitweb: Makefile improvements + gitweb: Check that $site_header etc. are defined before using them + gitweb: add a "string" variant of print_local_time + gitweb: add a "string" variant of print_sort_th + gitweb: Add optional extra parameter to die_error, for extended explanation + gitweb: Simplify (and fix) chop_str + +Junio C Hamano (7): + RPM packaging: use %global inside %{!?...} + Update draft release notes to 1.7.0 + build: make code "-Wpointer-arith" clean + fast-import.c: Fix big-file-threshold parsing bug + fast-import: count --max-pack-size in bytes + Revert 30816237 and 7e62265 + Update draft release notes to 1.7.0 + +Michael J Gruber (1): + git-clean: fix the description of the default behavior + +Michal Sojka (2): + filter-branch: Fix to allow replacing submodules with another content + filter-branch: Add tests for submodules in tree-filter + +Michele Ballabio (1): + git-gui: update Italian translation + +Nanako Shiraishi (1): + git-gui: update Japanese translation + +Nicolas Pitre (4): + fix multiple issues with t5300 + pack-objects: fix pack generation when using pack_size_limit + make --max-pack-size argument to 'git pack-object' count in bytes + update git-repack documentation wrt repack.UseDeltaBaseOffset + +Pal-Kristian Engstad (1): + git-p4: Fix sync errors due to new server version + +Pat Thoyts (1): + git-gui: use themed tk widgets with Tk 8.5 + +Paul Mackerras (1): + gitk: Fix copyright symbol in About box message + +Peter Krefting (1): + git-gui: Update Swedish translation (520t0f0u) + +Peter Oberndorfer (1): + git-gui: use different icon for new and modified files in the index + +Ralf Wildenhues (1): + Fix typos in technical documentation. + +René Scharfe (2): + grep: simplify assignment of ->fixed + archive: simplify archive format guessing + +Shawn O. Pearce (4): + git-gui: Remove unused icon file_parttick + git-gui: Update translation template + fast-import: Stream very large blobs directly to pack + Correct spelling of 'REUC' extension + +Wesley J. Landaker (1): + Update git fsck --full short description to mention packs + + +Version v1.7.0-rc1; changes since v1.6.6.2: +------------------------------------------- + +Alejandro Riveira Fernández (1): + Add test-run-command to .gitignore + +Andreas Gruenbacher (2): + builtin-apply.c: Skip filenames without enough components + builtin-apply.c: fix the --- and +++ header filename consistency check + +Andrew Myrick (3): + git-svn: ignore changeless commits when checking for a cherry-pick + git-svn: handle merge-base failures + git-svn: update svn mergeinfo test suite + +Andrzej K. Haczewski (1): + MSVC: Windows-native implementation for subset of Pthreads API + +Avery Pennarun (3): + git merge -X