--- git-1.7.7.orig/debian/git-doc.doc-base.git-trivial-merge-rules +++ git-1.7.7/debian/git-doc.doc-base.git-trivial-merge-rules @@ -0,0 +1,9 @@ +Document: git-trivial-merge-rules +Title: Trivial merge rules for git read-tree +Author: Daniel Barkalow +Abstract: This document describes the outcomes of the + trivial merge logic in git read-tree. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/technical/trivial-merge.txt --- git-1.7.7.orig/debian/gitweb.README.Debian +++ git-1.7.7/debian/gitweb.README.Debian @@ -0,0 +1,19 @@ +gitweb for Debian +----------------- + +The gitweb CGI by default looks into the directory /var/cache/git/ for +browsable repositories (this is configured in /etc/gitweb.conf). It expects +the repositories' .git subdirectories in /var/cache/git/, symlinks pointing +to the corresponding subdirectories in the repositories are just fine, e.g.: + + ln -s ~pape/git/foo/.git /var/cache/git/foo.git + +On systems with an Apache webserver, gitweb is automatically made available at +http://localhost/gitweb. You can deactivate it by commenting out the first +line of /etc/apache2/conf.d/gitweb. + +For more details about setting up gitweb for a git.example.org server, and +on how to make the git core tools such as 'git clone' work through http, see +/usr/share/doc/git/README.Debian. + + -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 --- git-1.7.7.orig/debian/git-daemon-run.README.Debian +++ git-1.7.7/debian/git-daemon-run.README.Debian @@ -0,0 +1,31 @@ +git-daemon-run for Debian +------------------------- + +This package enables a git-daemon service. This allows people to use a +git:// URL to access your repositories. + +After installing this package, wait five seconds for the git-daemon +service to be picked up by runit, and check its status and logs: + + sv stat git-daemon + cat /var/log/git-daemon/current + +See the sv(8) program on how to manage the service, or, alternatively, +create a symbolic link /etc/init.d/git-daemon pointing to /usr/bin/sv to +have an LSB compatible interface to control it: + + ln -s /usr/bin/sv /etc/init.d/git-daemon + /etc/init.d/git-daemon status + +The git daemon by default looks into the directory /var/cache/git/ for +repositories (this is configured in /etc/sv/git-daemon/run). It expects +the repositories' .git subdirectories in that directory, symlinks +pointing to the corresponding subdirectories in the repositories are just +fine, e.g.: + + ln -s ~pape/git/foo/.git /var/cache/git/foo.git + +This makes 'git-clone git://git.example.org/git/foo' to clone the foo +repository on remote machines work. + + -- Gerrit Pape Sun, 03 Jun 2007 09:51:53 +0000 --- git-1.7.7.orig/debian/changelog +++ git-1.7.7/debian/changelog @@ -0,0 +1,2481 @@ +git (1:1.7.7-2) unstable; urgency=low + + [ Jonathan Nieder ] + * debian/git.postinst: check if /usr/share/doc/git/contrib/hooks is a + symlink before changing it to one (thx Євгеній Мещеряков; closes: + #645005). + * debian/diff: + * 0001-ident-check-etc-mailname-if-author-email-is-unknown.diff, + 0007-Makefile-do-not-use-setgid-bit-on-...diff: remove; obsolete. + * 0002...0006, 0008...0015: rename to 0005-*, ..., 0017-*. + * 0001...0004: new from the upstream 'master' branch: + * ident: check /etc/mailname if email is unknown + * ident: do not retrieve default ident when unnecessary + * init --shared: do not set setgid bit on directories on + GNU/kFreeBSD + * Makefile: fix permissions of mergetools/ when building from + source extracted with permissive umask + * 0018-Makefile-add-a-knob-to-turn-off-hardlinks-...diff: new; + Makefile: add a knob to disable hardlinks within bindir and + gitexecdir. + * debian/rules: add NO_HARDLINKS=1 to OPTS (thx Bastian Blank; + closes: #642603). + * debian/rules: do not rely on umask to set contrib permissions. + * update debian/copyright. + * debian/watch, debian/copyright: point to code.google.com for now. + The upstream tarballs haven't been added back to kernel.org yet. + * debian/changelog.upstream, debian/versions.upstream: include + v1.7.6.4. + + [ Simon Chopin ] + * debian/git.postinst: fix fresh install contrib/hooks cleaning + (#645005). + + -- Gerrit Pape Thu, 13 Oct 2011 00:04:49 +0000 + +git (1:1.7.7-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + * debian/rules, debian/git.postinst: move contrib hooks from + /usr/share/doc/git-core/ into /usr/share/git-core/; provide symlink + for backward compatibility (closes: #640949). + + -- Gerrit Pape Sun, 09 Oct 2011 21:00:07 +0000 + +git (1:1.7.7~rc1-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/rules: git: skip directories in /usr/lib/git-core/ and + /usr/bin/ when stripping programs. + + -- Gerrit Pape Wed, 14 Sep 2011 14:23:10 +0000 + +git (1:1.7.6.3-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream point release. + * debian/diff: + * 0007-...diff, ..., 0014-...diff: slightly rework as 0008...0015-* + to provide better error reporting (thx Jonathan Nieder). + * 0015-Makefile-do-not-use-setgid-bit-on-...diff: rename to 0007-*. + + -- Gerrit Pape Wed, 14 Sep 2011 11:33:23 +0000 + +git (1:1.7.6-1) experimental; urgency=low + + * new upstream release. + * debian/diff: + * 0012-daemon-check-for-errors...diff: clarify patch description. + * 0013-transport-learn-to-honor-DNS-SRV...diff: rename to 0014-*. + * 0013-tcp-make-dns_resolve-return-an-error-code.diff: new; make + dns_resolve() pass on return value from getaddrinfo. + * 0014-transport-honor-DNS-SRV-records.diff: fix two regressions + introduced by this patch when it was added in 1:1.7.6~rc1-1. + * use descriptive messages like "Unable to look up + git.example.com: Out of memory" to report errors from the + resolver, instead of "unable to connect to a socket (success)". + * tolerate alias (CNAME) records in the DNS reply for + _git._tcp., instead of confusing them for invalid SRV + records and erroring out. + * 0015-Makefile-do-not-use-setgid...diff: new; Makefile: set + DIR_HAS_BSD_GROUP_SEMANTICS on GNU/kFreeBSD. + + -- Jonathan Nieder Tue, 28 Jun 2011 12:54:58 -0500 + +git (1:1.7.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + [ Daniel Baumann ] + * add an init.d script for git-daemon (closes: #422139). + * debian/control, debian/rules: new package git-daemon-sysvinit; + Depends: adduser; Conflicts: git-daemon-run; package git now + Suggests and git-all Recommends: git-daemon-run | + git-daemon-sysvinit. + * debian/git-daemon.init: new; script to start or stop git-daemon. + * debian/git-daemon.default: new; provide some default settings and + disable the daemon by default on first installation. + * debian/git-daemon-sysvinit.README.Debian: new; explain how to get + started. + * debian/git-daemon-sysvinit.conffiles: new; treat + /etc/default/git-daemon, /etc/init.d/git-daemon as conffiles. + * debian/git-daemon-sysvinit.postinst: new; add gitdaemon system + user; register and invoke init script to start git-daemon. + * debian/git-daemon-sysvinit.prerm: new; stops git-daemon. + * debian/git-daemon-sysvinit.postrm: new; unregisters init script. + + [ Jonathan Nieder ] + * debian/diff/: + * 0009-daemon-move-...diff, 0011-tcp-...diff: move fallback + definition of HOST_NAME_MAX to new use sites (fixes FTBFS on + kfreebsd). + * 0012-transport-learn-to-honor...diff: rename to 0013-*. + * 0012-daemon-check-for-errors-retrieving-canonical-IP-addre.diff: + new; daemon: check for errors when retrieving IP address for use + by the --interpolated-path feature. + + -- Jonathan Nieder Fri, 17 Jun 2011 15:56:12 -0500 + +git (1:1.7.6~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0007-...diff, ..., 0012-transport-learn...diff: new; + teach the git client to pay attention to SRV records (thx Julien + Cristau; closes: #627839). + * debian/rules: add USE_SRV_RR=1 to OPTS. + * debian/rules: add htmldir=/usr/share/doc/git/html to OPTS and + DOC_OPTS. + + -- Jonathan Nieder Thu, 09 Jun 2011 19:05:55 -0500 + +git (1:1.7.5.4-1) unstable; urgency=low + + * new upstream point release. + + [ Gerrit Pape ] + * debian/changelog.upstream, debian/versions.upstream: update upstream + changelog. + + [ Jonathan Nieder ] + * debian/changelog.upstream.sh: use set -e. + * debian/git-daemon/run: use SO_REUSEADDR when binding the listening + socket so the server can restart without waiting for old connections + to time out (thx Daniel Kahn Gillmor; closes: #609405). + * debian/git-daemon-run.postrm purge: terminate the git-daemon/log + service, even if there is an active connection using it, before + deleting logs and the gitlog user (thx Daniel Kahn Gillmor; closes: + #627314). + + -- Jonathan Nieder Tue, 07 Jun 2011 13:23:58 -0500 + +git (1:1.7.5.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0007-...diff, 0008-...diff, 0009-...diff, 0010-...diff: + remove; included upstream. + * debian/control: Package: git-cvs: make cvs dependency unversioned; + Package: git-gui: make tk dependency unversioned (thx Jonathan + Nieder). + + -- Gerrit Pape Fri, 27 May 2011 13:00:05 +0000 + +git (1:1.7.5.1-1) unstable; urgency=low + + * new upstream point release. + * merge branch debian-experimental. + * debian/diff/: + - 0009-upload-pack-start-pack-objects-before-async-rev-...diff: + remove; applied upstream. + - 0007, 0008 (the add -p split-and-edit fix): rename to 0009-*, + 0010-*. + - 0007-add-p-q-should-really-quit.diff, 0008-t3701-...diff: new + from upstream; tests: check that the add -p split-and-edit bug + has not resurfaced. + * debian/control: package git: no longer Conflicts: but Breaks: + git-core from Debian 5.0 (lenny) to simplify the upgrade path + (thx Russ Allbery for suggesting it through lintian). + * debian/control: package git: Conflicts: git-core from + Debian 4.0 (etch) which provided /usr/bin/git through the + alternatives system. + * debian/control: Standards-Version: 3.9.2.0. + + -- Jonathan Nieder Thu, 05 May 2011 03:41:36 -0500 + +git (1:1.7.5-1) experimental; urgency=low + + * new upstream release. + * 0009-upload-pack-start-pack-objects-before-async-rev-list.diff: + new from upstream; upload-pack: start pack-objects which reads + pack_pipe before writing to it to avoid deadlock (closes: + #607346). + * debian/changelog.upstream, debian/versions.upstream: do not skip + versions not packaged for Debian (thx Gerrit Pape). + + -- Jonathan Nieder Tue, 26 Apr 2011 21:49:48 -0500 + +git (1:1.7.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + * 0007-gitk-Take-only-numeric-version-components-when-comput.diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 20 Apr 2011 07:46:58 +0000 + +git (1:1.7.4.4-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0008...0064: remove; applied upstream. + * debian/diff/0008-add...diff, 0009-add-p-work...diff: new from + upstream; add -p: do not error out for attempts to stage hunks + after splitting and editing them. This fixes a regression + introduced by v1.7.4.3~10^2 (apply: do not patch lines that were + already patched, 2011-03-04). + * debian/git-doc.doc-base.git-index-format: new; catalog + .git/index file format document. + * debian/git.preinst, debian/git.postinst, debian/git.postrm: + don't use dpkg-maintscript-helper, avoiding a dependency on + recent dpkg (thx Anders Kaseorg and Marc Haber; closes: #618708). + * debian/git-daemon-run.postrm: terminate the git-daemon/log + service before deleting the gitlog user (closes: #610099). + + -- Jonathan Nieder Fri, 15 Apr 2011 00:00:03 -0500 + +git (1:1.7.4.1-5) unstable; urgency=low + + * merge branch debian-experimental. + * debian/diff/0008...0064: new from the upstream 'maint' branch: + (see RelNotes/1.7.4.2.txt for details) + * revert "core.abbrevguard: Ensure short object names stay + unique a bit longer" + * parse_tag_buffer(): do not prefixcmp() out of range + * pull: do not display fetch usage on --help-all + * gitweb: address warnings from perl 5.13 + * gitweb: replace tabs with spaces when highlighting syntax + * merge: honor prepare-commit-msg hook + * diff: handle diffstat of rewritten binary files + * config: add "[push] default = upstream" synonym for + "[push] default = tracking" + * diffcore: properly honor the difference between -M and -C + * diffcore: improve similarity heuristics for rename detection + * patch-id: do not trip over "no newline" marker + * various documentation, usage string, and code clarity + improvements + + -- Jonathan Nieder Wed, 16 Mar 2011 21:01:53 -0500 + +git (1:1.7.4.1-4) experimental; urgency=low + + * git-el.postinst: check if /usr/share/doc/git/contrib/emacs is a + symlink before changing it to one (closes: #617631). + * git-el.postinst: remove spurious .../contrib/emacs.old and + /usr/share/git-core/emacs/emacs symlinks. + * package git: do not run emacs-package-remove on upgrade (it's not + needed). + - git.postinst: do not run "emacs-package-remove git". + - debian/control: git no longer Depends: emacsen-common (closes: + #617784). + * git-el.emacsen-install, git-el.emacsen-remove: + - use printf instead of echo. + - only remove the lisp (.el) and bytecode (.elc) files that we + install. + - make output less noisy --- for example, do not say "+ set +x". + + -- Jonathan Nieder Sun, 13 Mar 2011 05:03:44 -0500 + +git (1:1.7.4.1-3) unstable; urgency=low + + [ Anders Kaseorg ] + * Loosen versioned replaces/conflicts on git-core, to fix upgrades from + lucid. + + [ Jonathan Nieder ] + * README.emacs: git-blame.el does not print a summary in the echo + area (documents: #611935). + * Move emacs support files to a separate git-el package. + * Make git depend on emacsen-support, so it can reliably clean up + the old emacs support files on upgrade (closes: #614578) + * git-el.emacsen-install: Overwrite .el symlinks if they already + exist (closes: #614659). + * git-el.emacsen-remove: Do not complain if the site-lisp + directory is nonempty or is already missing. + * debian/control: git-man: Section: doc. + + -- Jonathan Nieder Fri, 04 Mar 2011 18:26:27 -0600 + +git (1:1.7.4.1-1) unstable; urgency=low + + * new upstream release (closes: #600566, #575917, #578752, #583693, + #583699, #588103, #507476, #540001, #524309, #581691, #600785, + #577471, #607044, #606975, #610423, #610481). + + [ Anders Kaseorg ] + * debian/git.docs, debian/rules: deal with RelNotes subdirectory. + * debian/diff/0007-gitk-Take-only-numeric-...diff: new; gitk: do + not error out when git version number contains "-rc". + + [ Jonathan Nieder ] + * add myself as uploader. + * debian/diff/0003, 0007, 0010-0034: remove, applied upstream. + * debian/rules: accept patches with .patch suffix, too (thx Anders + Kaseorg). + * debian/rules: use patch -N -r- so patch application is idempotent. + * update debian/copyright. + * debian/diff/0001-ident-check-etc-mailname...diff: avoid calls to + gethostbyname when mailname is not an fqdn (closes: #611608). + * debian/diff/0005-gitk-use-...diff: new; gitk: use standard desktop + fonts by default. The appearance for users that already have a + generated ~/.gitk file is not affected (closes: #466471). + * debian/diff/0006-gitk-...diff: new; gitk: avoid spurious matches + in "All fields" search (thx Frédéric Brière, closes: #465776). + * debian/control: git-cvs: recommend cvs2git for one-time conversions + (closes: #585725). + * debian/control: git-core: explain that it still may be needed (thx + Denis Laxalde). + * debian/control: gitweb: allow lynx-cur to satisfy dependency on a + CGI implementation (thx Ivan Shmakov). + * debian/control, debian/rules: new architecture-independent package + git-man: manual pages that were previously in the main git package. + * debian/rules: do not build documentation on autobuilders (closes: + #499002). + * debian/control: Build-Depends-Indep: asciidoc, xmlto, docbook-xsl. + * debian/rules: git-gui: install git-gui--askpass helper to + /usr/lib/git-core (closes: #598245). + * debian/rules: git-doc: install symlink to html documentation in + /usr/share/doc/git (thx Ian Jackson). + * debian/watch: new; point to upstream sources. + * debian/implicit: create DEBIAN/md5sums with correct permissions. + * debian/diff/0003-remove-shebang...diff: new; do not start shell + libraries with #!/bin/sh. + * debian/rules: do not try to strip scripts even if they begin + with "# " in place of "#!". + * debian/diff/0004-pre-rebase-hook-capture...diff: new; + hooks/pre-rebase: use a < Tue, 15 Feb 2011 19:27:38 -0600 + +git (1:1.7.2.3-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/diff/0034-gitweb-Introduce-esc_attr...diff: new from + upstream: gitweb: do not parrot filenames or other arguments given + in a request without proper quoting (closes: #607248, + CVE-2010-3906). + + -- Jonathan Nieder Thu, 16 Dec 2010 01:00:30 -0600 + +git (1:1.7.2.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/diff/0010...0033: new from the upstream 'maint' branch: + * cache_tree_free: Fix small memory leak. + * diff.c: call regfree to free memory allocated by regcomp. + * gitweb: allow configurations that change with each request + (fixes a regression from v1.7.2-rc2 in some gitolite setups). + * Documentation: 19 formatting fixes (thx Frédéric Brière, + closes: #540001, #600422). + * setup: make sure git dir path is in a permanent buffer. + * do not depend on signed integer overflow. + * debian/control: gitweb: weaken dependencies to allow configurations + using mod_perl or fastcgi rather than CGI; explain dependencies in + the package description (thx Servilio Afre Puentes, + closes: #600413). + + -- Jonathan Nieder Thu, 18 Nov 2010 19:04:09 -0600 + +git (1:1.7.2.3-2) unstable; urgency=low + + * merge branch debian-experimental. + * debian/gitweb.NEWS.Debian: typo (thx Jonathan Nieder). + + -- Gerrit Pape Sun, 17 Oct 2010 20:07:22 +0000 + +git (1:1.7.2.3-1) experimental; urgency=low + + * new upstream release. + * post-receive-email: document command-line mode (closes: #428413). + * add-interactive: Clarify “remaining hunks in the file” + (closes: #526014). + * rebase -i -p: document shortcomings (closes: #532775). + * GIT-VERSION-GEN: restrict tags used (closes: #473604). + * git svn: avoid unnecessary '/' in paths for SVN (thx Jon Dowland, + closes: #546733, #572847). + * git svn: avoid uninitialized var in 'reset' (thx Jens Seidel, + closes: #578908). + * debian/diff/0003-git-submodule.sh-properly-initialize-shell-...diff, + debian/diff/0004-Check-size-of-path-buffer-before-...diff: remove; + applied upstream. + * debian/diff/0001-Revert-gitweb-Use-diff_opts-while...diff: new; + prevent gitweb from serving rename patches that GNU patch 2.6.1 + cannot apply. + * debian/diff/0002-Revert-Merge-branch-jn-gitweb-plackup.diff: new; + install gitweb.css et al in /usr/share/gitweb, not a new static/ + subdirectory. + * debian/diff/0003-Do-not-unquote-into-in-URLs.diff: new from + upstream; do not unquote + into space character in URLs. + * debian/diff/0001-bug-448655-check-etc-mailname-...diff: rename to + debian/diff/0004-bug-448655-check-etc-mailname-if-author...diff. + * debian/diff/0002-bug-506445-hooks-post-receive-...diff: rename to + debian/diff/0005-bug-506445-hooks-post-receive-...diff; adapt. + * debian/diff/0006-instaweb-ignore-GITWEB_CONFIG_SYSTEM.diff: new; + instaweb: ignore /etc/gitweb.conf; + debian/diff/0007-gitweb-skip-logo-in-atom-feed-when...diff, ..., + debian/diff/0009-instaweb-disable-logo-and-favicon...diff: new; + instaweb: avoid 404 errors due to nonexistent image files (thx Uwe + Kleine-König, closes: #592733). + * update debian/copyright. + * debian/rules, debian/git.README.Debian, debian/gitweb.conf: + install gitweb.js, add an Alias for it to the VirtualHost example, + and configure gitweb to look for it in the right place (closes: + #555047). + * debian/gitweb.NEWS.Debian: mention the new gitweb.js file. + * debian/control: gitweb: Depends: apache2 | httpd-cgi (closes: + #559890). + * debian/gitweb.conf: use relative links for gitweb.css et al + (thx Alban Browaeys, closes: #568343). + * debian/control: package git: no longer Conflicts: git + (<< 4.3.20-11). + * debian/control: package git: Breaks: packages from Debian 5.0 + (lenny) relying on removed features such as dashed-form commands in + $PATH (thx Adrian Bunk, closes: #561701); no longer Conflicts: but + Breaks: ancient qgit for the same reason. + * debian/gitweb.README.Debian: copy-edit. + * debian/git.README.Debian: retitle to "Git for Debian" (thx + Christoph Anton Mitterer, closes: #590129). + * debian/control: Homepage: http://git-scm.com/ (closes: #553220). + * debian/control: package git no longer Depends: libdigest-sha1-perl + (thx Ansgar Burchardt, closes: #591039). + * debian/control: Build-Depends: libio-pty-perl for better test + coverage. + + -- Jonathan Nieder Fri, 03 Sep 2010 22:34:30 -0500 + +git (1:1.7.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * debian/diff/0004-Check-size-of-path-buffer-before-writing-...diff: + new, cherry-picked from 3c9d041: setup: Check size of path buffer + before writing into it (closes: #590026, CVE-2010-2542). + + -- Jonathan Nieder Sun, 25 Jul 2010 18:01:15 -0500 + +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.7.orig/debian/git-doc.doc-base.git-technical +++ git-1.7.7/debian/git-doc.doc-base.git-technical @@ -0,0 +1,14 @@ +Document: git-api +Title: Git internal API documentation +Author: Junio C Hamano and the git list +Abstract: Git has grown a set of internal API over time. + This collection documents them. +Section: Programming/C + +Format: Text +Index: /usr/share/doc/git-doc/technical/api-index.txt +Files: /usr/share/doc/git-doc/technical/api-*.txt + +Format: HTML +Index: /usr/share/doc/git-doc/technical/api-index.html +Files: /usr/share/doc/git-doc/technical/api-*.html --- git-1.7.7.orig/debian/git-doc.doc-base.git-pack-format +++ git-1.7.7/debian/git-doc.doc-base.git-pack-format @@ -0,0 +1,9 @@ +Document: git-pack-format +Title: Git pack format and packing heuristics +Author: Jon Loeliger, Junio C Hamano, and the git list +Abstract: Git's packed data format. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/technical/pack-format.txt + /usr/share/doc/git-doc/technical/pack-heuristics.txt --- git-1.7.7.orig/debian/changelog.upstream +++ git-1.7.7/debian/changelog.upstream @@ -0,0 +1,31389 @@ +Version v1.7.7; changes since v1.7.7-rc1: +----------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Bryan Jacobs (1): + git-svn: teach git-svn to populate svn:mergeinfo + +Frédéric Heitzmann (1): + Disambiguate duplicate t9160* tests + +Gerrit Pape (2): + contrib/hooks: adapt comment about Debian install location for contrib hooks + templates/hooks--*: remove sample hooks without any functionality + +Jay Soffian (1): + git-mergetool: check return value from read + +Jeff King (1): + t4014: clean up format.thread config after each test + +Junio C Hamano (7): + Documentation/gitnamespaces.txt: cater to older asciidoc + branch --set-upstream: regression fix + Git 1.7.7-rc2 + Git 1.7.6.4 + merge-recursive: Do not look at working tree during a virtual ancestor merge + Git 1.7.7-rc3 + Git 1.7.7 + +Pang Yan Han (1): + format-patch: ignore ui.color + + +Version v1.7.7-rc1; changes since v1.7.7-rc0: +--------------------------------------------- + +Ben Walton (2): + Documentation: Grammar correction, wording fixes and cleanup + Mark http-fetch without -a as deprecated + +Brandon Casey (1): + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh + +Brian Gernhardt (1): + t5540-http-test: shorten grep pattern + +Bryan Jacobs (1): + git-svn: Teach dcommit --mergeinfo to handle multiple lines + +Conrad Irwin (2): + Prevent force-updating of the current branch + Show interpreted branch name in error messages + +Dmitry Ivankov (11): + fast-import: add input format tests + fast-import: don't fail on omitted committer name + fast-import: check committer name more strictly + fsck: add a few committer name tests + fsck: improve committer/author check + fast-import: add a test for tree delta base corruption + fast-import: prevent producing bad delta + fast-import: count and report # of calls to diff_delta in stats + fast-import: treat cat-blob as a delta base hint for next blob + fast-import: add tests for tagging blobs + fast-import: allow to tag newly created objects + +Elijah Newren (55): + t6042: Add a testcase where git deletes an untracked file + t6042: Add failing testcase for rename/modify/add-source conflict + t6042: Add a pair of cases where undetected renames cause issues + t6042: Add a testcase where undetected rename causes silent file deletion + t6042: Add tests for content issues with modify/rename/directory conflicts + t6042: Ensure rename/rename conflicts leave index and workdir in sane state + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts + t6036: Add differently resolved modify/delete conflict in criss-cross test + t6036: criss-cross with weird content can fool git into clean merge + t6036: tests for criss-cross merges with various directory/file conflicts + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify + t6022: Remove unnecessary untracked files to make test cleaner + t6022: New tests checking for unnecessary updates of files + t6022: Add testcase for merging a renamed file with a simple change + merge-recursive: Make BUG message more legible by adding a newline + merge-recursive: Correct a comment + merge-recursive: Mark some diff_filespec struct arguments const + merge-recursive: Consolidate different update_stages functions + merge-recursive: Remember to free generated unique path names + merge-recursive: Avoid working directory changes during recursive case + merge-recursive: Fix recursive case with D/F conflict via add/add conflict + merge-recursive: Fix sorting order and directory change assumptions + merge-recursive: Fix code checking for D/F conflicts still being present + merge-recursive: Save D/F conflict filenames instead of unlinking them + merge-recursive: Split was_tracked() out of would_lose_untracked() + merge-recursive: Allow make_room_for_path() to remove D/F entries + merge-recursive: Split update_stages_and_entry; only update stages at end + merge-recursive: Fix deletion of untracked file in rename/delete conflicts + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead + merge-recursive: Add comments about handling rename/add-source cases + merge-recursive: Improve handling of rename target vs. directory addition + merge-recursive: Consolidate process_entry() and process_df_entry() + merge-recursive: Cleanup and consolidation of rename_conflict_info + merge-recursive: Provide more info in conflict markers with file renames + merge-recursive: When we detect we can skip an update, actually skip it + merge-recursive: Fix modify/delete resolution in the recursive case + merge-recursive: Introduce a merge_file convenience function + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base + merge-recursive: Small cleanups for conflict_rename_rename_1to2 + merge-recursive: Defer rename/rename(2to1) handling until process_entry + merge-recursive: Record more data needed for merging with dual renames + merge-recursive: Create function for merging with branchname:file markers + merge-recursive: Consider modifications in rename/rename(2to1) conflicts + merge-recursive: Make modify/delete handling code reusable + merge-recursive: Have conflict_rename_delete reuse modify/delete code + merge-recursive: add handling for rename/rename/add-dest/add-dest + merge-recursive: Fix working copy handling for rename/rename/add/add + t6022: Add testcase for spurious "refusing to lose untracked" messages + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages + t6022: Additional tests checking for unnecessary updates of files + merge-recursive: Avoid unnecessary file rewrites + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest + merge-recursive: Don't re-sort a list whose order we depend upon + +Eric Wong (1): + git-svn: fix fetch with moved path when using rewriteRoot + +Fredrik Gustafsson (1): + push: Don't push a repository with unpushed submodules + +Fredrik Kuivinen (6): + Add obstack.[ch] from EGLIBC 2.10 + Add string search routines from GNU grep + Adapt the kwset code to Git + Use kwset in pickaxe + Use kwset in grep + obstack: Fix portability issues + +Giuseppe Bilotta (2): + am: format is in $patch_format, not parse_patch + am: fix stgit patch mangling + +Jeff King (12): + t3030: fix accidental success in symlink rename + t7006: modernize calls to unset + test-lib: add helper functions for config + t7006: use test_config helpers + setup_pager: set GIT_PAGER_IN_USE + diff: refactor COLOR_DIFF from a flag into an int + git_config_colorbool: refactor stdout_is_tty handling + color: delay auto-color decision until point of use + config: refactor get_colorbool function + diff: don't load color config in plumbing + want_color: automatically fallback to color.ui + support pager.* for external commands + +Jens Lehmann (1): + fetch: skip on-demand checking when no submodules are configured + +Johannes Sixt (2): + string-list: Add API to remove an item from an unsorted list + t3005: do not assume a particular order of stdout and stderr of git-ls-files + +Jon Seymour (1): + bisect: take advantage of gettextln, eval_gettextln. + +Jonathan Nieder (1): + Documentation/remote-helpers: explain capabilities first + +Junio C Hamano (14): + combine-diff: support format_callback + read_gitfile_gently(): rename misnamed function to read_gitfile() + clone: allow more than one --reference + clone: clone from a repository with relative alternates + Update draft release notes to 1.7.7 + Documentation: clarify "git clean -e " + Update draft release notes to 1.7.7 + Revert "Merge branch 'cb/maint-quiet-push' into maint" + Git 1.7.6.2 + Update draft release notes to 1.7.7 + Minor update to how-to maintain git + Prepare for 1.7.6.3 maintenance release + Git 1.7.6.3 + Git 1.7.7-rc1 + +Matthieu Moy (2): + Documentation/git-remote-helpers: explain how import works with multiple refs + (short) documentation for the testgit remote helper + +Michael Haggerty (9): + Add a file comment + Document struct match_attr + Increment num_attr in parse_attr_line(), not parse_attr() + Change parse_attr() to take a pointer to struct attr_state + Determine the start of the states outside of the pass loop + Change while loop into for loop + Unroll the loop over passes + check-ref-format --print: Normalize refnames that start with slashes + Forbid DEL characters in reference names + +Michael J Gruber (3): + git-notes.txt: clarify -C vs. copy and -F + log: Do not decorate replacements with --no-replace-objects + RelNotes/1.7.7: minor fixes + +Michael Stapelberg (1): + git-daemon.txt: specify --timeout in seconds + +Namhyung Kim (1): + branch -v: honor core.abbrev + +Nguyễn Thái Ngọc Duy (6): + decoration: do not mis-decorate refs with same prefix + Add for_each_commit_graft() to iterate all grafts + Move write_shallow_commits to fetch-pack.c + log: decorate grafted commits with "grafted" + log: decorate "replaced" on to replaced commits + clone: allow to clone from .git file + +Pete Wyckoff (1): + git-p4: simple branch tests edits + +Ray Chen (1): + git-svn: New flag to emulate empty directories + +Sverre Rabbelier (1): + SubmittingPathces: remove Cogito reference + +Tay Ray Chuan (2): + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() + +Thomas Rast (8): + Use memmove in ident_to_git + t4014: check for empty files from git format-patch --stdout + t4014: invoke format-patch with --stdout where intended + t4014: "no-add-headers" is actually called "no-add-header" + Document negated forms of format-patch --to --cc --add-headers + strbuf_grow(): maintain nul-termination even for new buffer + Documentation: clarify effects of -- arguments + t3903: fix misquoted rev-parse invocation + +Vitor Antunes (9): + git-p4: Allow setting rename/copy detection threshold + git-p4: Add description of rename/copy detection options + git-p4: Add test case for rename detection + git-p4: Add test case for copy detection + git-p4: Process detectCopiesHarder with --bool + git-p4: Correct branch base depot path detection + git-p4: Allow filtering Perforce branches by user + git-p4: Allow branch definition with git config + git-p4: Add simple test case for branch import + + +Version v1.7.7-rc0; changes since v1.7.6.4: +------------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Andi Kleen (2): + Add profile feedback build to git + Add explanation of the profile feedback build to the README + +Clemens Buchacher (1): + commit: allow partial commits with relative paths + +David Aguilar (8): + setup: Provide GIT_PREFIX to built-ins + git: Remove handling for GIT_PREFIX + git-mergetool--lib: Make vimdiff retain the current directory + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests + difftool--helper: Make style consistent with git + mergetool--lib: Make style consistent with git + mergetool--lib: Refactor tools into separate files + mergetools/meld: Use '--output' when available + +David Barr (1): + am: ignore leading whitespace before patch + +David Caldwell (1): + stash: Add --include-untracked option to stash and remove all untracked files + +Dmitry Ivankov (4): + remote-helpers: export GIT_DIR variable to helpers + parse-options: export opterr, optbug + Reduce parse-options.o dependencies + doc/fast-import: document feature import-marks-if-exists + +Duncan Brown (1): + http: pass http.cookiefile using CURLOPT_COOKIEFILE + +Erik Faye-Lund (2): + verify_path: consider dos drive prefix + connect: only log if all attempts failed (ipv4) + +Fredrik Gustafsson (2): + git-sh-setup: add die_with_status + submodule update: continue when a checkout fails + +Jakub Narebski (14): + gitweb.js: No need for inProgress in blame_incremental.js + gitweb.js: No need for loop in blame_incremental's handleResponse() + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js + gitweb: Check permissions first in git_search + gitweb: Split body of git_search into subroutines + gitweb: Clean up code in git_search_* subroutines + gitweb: Make git_search_* subroutines render whole pages + gitweb: Refactor git_header_html + git-instaweb: Extract configuring web server into configure_httpd + git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf + git-instaweb: Move all actions at the end of script + git-instaweb: Check that correct config file exists for (re)start + gitweb: Introduce common system-wide settings for convenience + gitweb: Git config keys are case insensitive, make config search too + +Jeff King (28): + t: add tests for cloning remotes with detached HEAD + consider only branches in guess_remote_head + make copy_ref globally available + clone: always fetch remote HEAD + limit "contains" traversals based on commit timestamp + default core.clockskew variable to one day + archive: reorder option parsing and config reading + archive-tar: don't reload default config options + archive: refactor list of archive formats + archive: pass archiver struct to write_archive callback + archive: move file extension format-guessing lower + archive: refactor file extension format-guessing + archive: implement configurable tar filters + archive: provide builtin .tar.gz filter + upload-archive: allow user to turn off filters + parse-options: add OPT_STRING_LIST helper + remote: use new OPT_STRING_LIST + config: make git_config_parse_parameter a public function + clone: accept config options on the command line + git skew: a tool to find how big a clock skew exists in the history + transport-helper: fix minor leak in push_refs_with_export + t5800: factor out some ref tests + t5800: document some non-functional parts of remote helpers + git-remote-testgit: import non-HEAD refs + transport-helper: don't feed bogus refs to export push + git_remote_helpers: push all refs during a non-local export + streaming: free git_istream upon closing + docs: put listed example commands in backticks + +Jens Lehmann (1): + Documentation/submodule: add command references and update options + +Jim Meyering (1): + sha1_file: use the correct type (ssize_t, not size_t) for read-style function + +Johannes Sixt (7): + sh-i18n--envsubst: do not crash when no arguments are given + mingw.c: move definition of mingw_getenv down + Windows: teach getenv to do a case-sensitive search + rebase: do not print lots of usage hints after an obvious error message + Make test number unique + Skip archive --remote tests on Windows + t3900: do not reference numbered arguments from the test script + +Jon Jensen (1): + Add option hooks.diffopts to customize change summary in post-receive-email + +Jon Seymour (16): + bisect: move argument parsing before state modification. + bisect: use && to connect statements that are deferred with eval. + bisect: add tests to document expected behaviour in presence of broken trees. + bisect: introduce support for --no-checkout option. + bisect: introduce --no-checkout support into porcelain. + bisect: add tests for the --no-checkout option. + bisect: add documentation for --no-checkout option. + bisect: cleanup whitespace errors in git-bisect.sh. + bisect: replace "; then" with "\n*then" + misc-sh: fix up whitespace in some other .sh files. + gettext: add gettextln, eval_gettextln to encode common idiom + git-am: take advantage of gettextln and eval_gettextln. + pull: take advantage of eval_gettextln + stash: take advantage of eval_gettextln + submodule: take advantage of gettextln and eval_gettextln. + bisect: add support for bisecting bare repositories + +Jonathan Nieder (4): + test: simplify return value of test_run_ + test: cope better with use of return for errors + revert: plug memory leak in "cherry-pick root commit" codepath + merge-recursive: take advantage of hardcoded empty tree + +Josh Triplett (5): + Fix prefix handling in ref iteration functions + ref namespaces: infrastructure + ref namespaces: Support remote repositories via upload-pack and receive-pack + ref namespaces: documentation + ref namespaces: tests + +Junio C Hamano (52): + index-pack: group the delta-base array entries also by type + write_idx_file: introduce a struct to hold idx customization options + index-pack: --verify + write_idx_file: need_large_offset() helper function + index-pack --verify: read anomalous offsets from v2 idx file + packed_object_info_detail(): do not return a string + sha1_object_info_extended(): expose a bit more info + sha1_object_info_extended(): hint about objects in delta-base cache + unpack_object_header(): make it public + write_entry(): separate two helper functions out + streaming: a new API to read from the object store + streaming_write_entry(): use streaming API in write_entry() + convert: CRLF_INPUT is a no-op in the output codepath + streaming_write_entry(): support files with holes + streaming: read non-delta incrementally from a pack + sha1_file.c: expose helpers to read loose objects + streaming: read loose objects incrementally + checkout: make advice when reattaching the HEAD less loud + merge: reword the final message + convert.h: move declarations for conversion from cache.h + Add streaming filter API + stream filter: add "no more input" to the filters + Add LF-to-CRLF streaming conversion + streaming filter: ident filter + streaming: filter cascading + t0021: test application of both crlf and ident + diff --stat-count: finishing touches + index-pack: a miniscule refactor + index-pack: start learning to emulate "verify-pack -v" + index-pack: show histogram when emulating "verify-pack -v" + verify-pack: use index-pack --verify + verify_path(): simplify check at the directory boundary + git-submodule.sh: clarify the "should we die now" logic + Add option to disable NORETURN + Start 1.7.7 cycle + core: log offset pack data accesses happened + pack-objects: optimize "recency order" + diff-lib: simplify do_diff_cache() + diff-lib: refactor run_diff_index() and do_diff_cache() + Revert clock-skew based attempt to optimize tag --contains traversal + Update draft release notes to 1.7.7 + Update draft release notes to 1.7.7 + bisect: further style nitpicks + filter-branch.sh: de-dent usage string + Update draft release notes to 1.7.7 + test: consolidate definition of $LF + Sync with "maint" + Update draft release notes to 1.7.7 + Update draft release notes to 1.7.7 + commit: reduce use of redundant global variables + Update draft release notes to 1.7.7 + Git 1.7.7-rc0 + +Ludwig Nussel (1): + gitweb: allow space as delimiter in mime.types + +Markus Duft (1): + Update the Interix default build configuration. + +Michael Haggerty (29): + doc: Add a link from gitattributes(5) to git-check-attr(1) + doc: Correct git_attr() calls in example code + Remove anachronism from comment + Disallow the empty string as an attribute name + git-check-attr: Add missing "&&" + git-check-attr: Add tests of command-line parsing + Provide access to the name attribute of git_attr + git-check-attr: Use git_attr_name() + Teach prepare_attr_stack() to figure out dirlen itself + Extract a function collect_all_attrs() + Remove redundant call to bootstrap_attr_stack() + Remove redundant check + Allow querying all attributes on a file + git-check-attr: Extract a function output_attr() + git-check-attr: Introduce a new variable + git-check-attr: Extract a function error_with_usage() + git-check-attr: Handle each error separately + git-check-attr: Process command-line args more systematically + git-check-attr: Error out if no pathnames are specified + git-check-attr: Add an --all option to show all attributes + git-check-attr: Drive two tests using the same raw data + git-check-attr: Fix command-line handling to match docs + Rename git_checkattr() to git_check_attr() + git-check-attr: test that no output is written to stderr + git-check-attr: Demonstrate problems with unnormalized paths + git-check-attr: Demonstrate problems with relative paths + git-check-attr: Normalize paths + test-path-utils: Add subcommand "absolute_path" + test-path-utils: Add subcommand "prefix_path" + +Michael J Gruber (3): + diff.c: omit hidden entries from namelen calculation with --stat + diff: introduce --stat-lines to limit the stat lines + diff-options.txt: describe --stat-{width,name-width,count} + +Pete Wyckoff (4): + git-p4: use test_when_finished in tests + git-p4: add missing && in test + git-p4: one test missing config git-p4.skipSubmitEditCheck + git-p4: commit time should be most recent p4 change time + +Ramsay Allan Jones (3): + help.c: Fix detection of custom merge strategy on cygwin + t1301-*.sh: Fix the 'forced modes' test on cygwin + config.c: Make git_config() work correctly when called recursively + +René Scharfe (6): + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test + grep: fix coloring of hunk marks between files + grep: add --break + grep: add --heading + grep: add option to show whole function as context + grep: long context options + +Roberto Tyley (1): + Tolerate zlib deflation with window size < 32Kb + +Sverre Rabbelier (14): + t5800: use skip_all instead of prereq + remote-curl: accept empty line as terminator + git-remote-testgit: only push for non-local repositories + git-remote-testgit: fix error handling + fast-import: introduce 'done' command + fast-export: support done feature + transport-helper: factor out push_update_refs_status + transport-helper: check status code of finish_command + transport-helper: use the new done feature where possible + transport-helper: update ref status after push with export + transport-helper: change import semantics + transport-helper: Use capname for refspec capability too + transport-helper: implement marks location as capability + transport-helper: die early on encountering deleted refs + +Tay Ray Chuan (13): + xdiff/xprepare: use memset() + xdiff/xprepare: refactor abort cleanups + xdiff/xpatience: factor out fall-back-diff function + t4033-diff-patience: factor out tests + teach --histogram to diff + xdiff/xprepare: skip classification + xdiff/xprepare: use a smaller sample size for histogram diff + xdiff: do away with xdl_mmfile_next() + http.c: fix an invalid free() + Makefile: some changes for http-related flag documentation + xdiff/xhistogram: rework handling of recursed results + xdiff/xhistogram: rely on xdl_trim_ends() + xdiff/xhistogram: drop need for additional variable + +Theo Niessink (3): + A Windows path starting with a backslash is absolute + real_path: do not assume '/' is the path seperator + verify_dotfile(): do not assume '/' is the path seperator + +Thomas Cort (1): + Makefile: add Minix configuration options. + +maximilian attems (2): + am: pass exclude down to apply + am: Document new --exclude= option + +Ævar Arnfjörð Bjarmason (48): + i18n: git-am add git-sh-i18n + i18n: git-am one-line gettext $msg; echo + i18n: git-am multi-line getttext $msg; echo + i18n: git-am eval_gettext messages + i18n: git-am gettext + gettext to stderr message + i18n: git-am die messages + i18n: git-am cannot_fallback messages + i18n: git-am clean_abort messages + i18n: git-am "Apply?" message + i18n: git-am "Falling back" say message + i18n: git-am core say messages + i18n: git-am printf(1) message to eval_gettext + i18n: git-pull add git-sh-i18n + i18n: git-pull die messages + i18n: git-pull eval_gettext + die message + i18n: git-pull eval_gettext + warning message + i18n: git-submodule add git-sh-i18n + i18n: git-submodule echo + eval_gettext messages + i18n: git-submodule say + eval_gettext messages + i18n: git-submodule die + eval_gettext messages + i18n: git-submodule $update_module say + die messages + i18n: git-submodule "cached cannot be used" message + i18n: git-submodule "Submodule change[...]" messages + i18n: git-submodule $errmsg messages + i18n: git-submodule "Entering [...]" message + i18n: git-submodule "[...] path is ignored" message + i18n: git-submodule "path not initialized" message + i18n: git-submodule "blob" and "submodule" messages + i18n: git-stash add git-sh-i18n + i18n: git-stash echo + gettext message + i18n: git-stash say + gettext messages + i18n: git-stash die + gettext messages + i18n: git-stash die + eval_gettext messages + i18n: git-stash die + eval_gettext $* messages + i18n: git-stash die + eval_gettext $1 messages + i18n: git-stash "unknown option" message + i18n: git-stash drop_stash say/die messages + i18n: git-bisect add git-sh-i18n + i18n: git-bisect gettext + echo message + i18n: git-bisect echo + gettext messages + i18n: git-bisect echo + eval_gettext message + i18n: git-bisect die + gettext messages + i18n: git-bisect die + eval_gettext messages + i18n: git-bisect bisect_run + $@ messages + i18n: git-bisect bisect_reset + $1 messages + i18n: git-bisect bisect_replay + $1 messages + i18n: git-bisect [Y/n] messages + i18n: git-bisect bisect_next_check "You need to" message + +张忠山 (1): + gitweb: pass string after encoding in utf-8 to syntax highlighter + + +Version v1.7.6.4; changes since v1.7.6.3: +----------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Clemens Buchacher (1): + ls-files: fix pathspec display on error + +Giuseppe Bilotta (1): + am: format is in $patch_format, not parse_patch + +Jay Soffian (1): + git-mergetool: check return value from read + +Johannes Sixt (1): + t3005: do not assume a particular order of stdout and stderr of git-ls-files + +Junio C Hamano (4): + read_gitfile_gently(): rename misnamed function to read_gitfile() + clone: allow more than one --reference + clone: clone from a repository with relative alternates + Git 1.7.6.4 + +Michael Haggerty (2): + check-ref-format --print: Normalize refnames that start with slashes + Forbid DEL characters in reference names + +Michael J Gruber (1): + branch.c: use the parsed branch name + +Nguyễn Thái Ngọc Duy (1): + clone: allow to clone from .git file + + +Version v1.7.6.3; changes since v1.7.6.2: +----------------------------------------- + +Dave Zarzycki (1): + Do not log unless all connect() attempts fail + +Jeff King (9): + status: fix bug with missing --ignore files + tag: speed up --contains calculation + strbuf_split: add a max parameter + fix "git -c" parsing of values with equals signs + config: die on error in command-line config + config: avoid segfault when parsing command-line config + strbuf: allow strbuf_split to work on non-strbufs + config: use strbuf_split_str instead of a temporary strbuf + reset: give better reflog messages + +Jens Lehmann (1): + fetch: skip on-demand checking when no submodules are configured + +Jonathan Nieder (2): + Documentation: quote double-dash for AsciiDoc + Documentation/i18n: quote double-dash for AsciiDoc + +Junio C Hamano (4): + git status --ignored: tests and docs + mergetool: check return value from read + Prepare for 1.7.6.3 maintenance release + Git 1.7.6.3 + +Michael Schubert (1): + reflog: actually default to subcommand 'show' + +Sverre Rabbelier (1): + SubmittingPathces: remove Cogito reference + +Vitaliy Ivanov (1): + tests: cleanup binary test vector files + + +Version v1.7.6.2; changes since v1.7.6.1: +----------------------------------------- + +Junio C Hamano (3): + whitespace: have SP on both sides of an assignment "=" + Revert "Merge branch 'cb/maint-quiet-push' into maint" + Git 1.7.6.2 + +Pang Yan Han (1): + update-ref: whitespace fix + +Thomas Rast (1): + Documentation: clarify effects of -- arguments + + +Version v1.7.6.1; changes since v1.7.6: +--------------------------------------- + +Alex Neronskiy (2): + Fix documentation of fetch-pack that implies that the client can disconnect after sending wants. + Document the underlying protocol used by shallow repositories and --depth commands. + +Andrew Wong (1): + rebase -i -p: include non-first-parent commits in todo list + +Bert Wesarg (1): + Documentation: clearly specify what refs are honored by core.logAllRefUpdates + +Brandon Casey (2): + t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin + git-submodule.sh: preserve stdin for the command spawned by foreach + +Brian Harring (1): + get_indexed_object can return NULL if nothing is in that slot; check for it + +Carlos Martín Nieto (1): + Documentation: clarify the invalidated tree entry format + +Clemens Buchacher (3): + error_routine: use parent's stderr if exec fails + propagate --quiet to send-pack/receive-pack + notice error exit from pager + +Dmitry Ivankov (1): + doc/fast-import: clarify notemodify command + +Emilio G. Cota (2): + Documentation: ignore *.pdf files + Documentation/Makefile: add *.pdf to `clean' target + +Erik Faye-Lund (1): + connect: correctly number ipv6 network adapter + +Fredrik Kuivinen (1): + Makefile: Track changes to LDFLAGS and relink when necessary + +Heiko Voigt (2): + add gitignore entry to description about how to write a builtin + add technical documentation about ref iteration + +Jack Nagel (1): + Documentation: minor grammatical fix in rev-list-options.txt + +Jakub Narebski (2): + gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss + gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss + +Jeff King (10): + combine-diff: split header printing into its own function + combine-diff: calculate mode_differs earlier + combine-diff: handle binary files as binary + refactor get_textconv to not require diff_filespec + combine-diff: respect textconv attributes + tag: accept multiple patterns for --list + docs: document --textconv diff option + t7400: fix bogus test failure with symlinked trash + fast-export: quote paths in output + am: refresh the index at start and --resolved + +Jens Lehmann (7): + submodule add: test failure when url is not configured in superproject + submodule add: allow relative repository path even when no url is set + submodule add: clean up duplicated code + fetch: Also fetch submodules in subdirectories in on-demand mode + submodule add: always initialize .git/config entry + tests: print failed test numbers at the end of the test run + submodule: update and add must honor --quiet flag + +Johannes Schindelin (1): + get_pwd_cwd(): Do not trust st_dev/st_ino blindly + +Jon Seymour (2): + Add a test to check that git ls-tree sets non-zero exit code on error. + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. + +Julian Phillips (1): + remote-curl: Add a format check to parsing of info/refs + +Junio C Hamano (29): + diff-index --quiet: learn the "stop feeding the backend early" logic + checkout -b : correctly detect existing branch + sha1_file.c: "legacy" is really the current format + zlib wrapper: refactor error message formatter + zlib: wrap remaining calls to direct inflate/inflateEnd + zlib: wrap inflateInit2 used to accept only for gzip format + zlib: wrap deflate side of the API + zlib: wrap deflateBound() too + zlib: zlib can only process 4GB at a time + zlib: allow feeding more than 4GB in one go + t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met + cygwin: trust executable bit by default + git-remote.txt: avoid sounding as if loose refs are the only ones in the world + check-ref-format doc: de-emphasize the implementation detail of a ref + git.txt: de-emphasize the implementation detail of a ref + glossary: update description of "tag" + glossary: update description of head and ref + glossary: clarify description of HEAD + submodule sync: do not auto-vivify uninteresting submodule + "branch -d" can remove more than one branches + test: skip clean-up when running under --immediate mode + checkout: do not write bogus reflog entry out + reset [] paths...: do not mishandle unmerged paths + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" + receive-pack: do not overstep command line argument array + helping smart-http/stateless-rpc fetch race + Prepare for 1.7.6.1 + Update draft release notes for 1.7.6.1 + Git 1.7.6.1 + +Martin von Zweigbergk (2): + Documentation: use [verse] for SYNOPSIS sections + rebase: clarify "restore the original branch" + +Michael Haggerty (6): + git-svn: Demonstrate a bug with root commits in mergeinfo ranges + git-svn: Disambiguate rev-list arguments to improve error message + git-svn: Correctly handle root commits in mergeinfo ranges + gitattributes: Clarify discussion of attribute macros + gitattributes: Reword "attribute macro" to "macro attribute" + Do not use C++-style comments + +Michael Schubert (1): + help_unknown_cmd: do not propose an "unknown" cmd + +Michael Witten (1): + filter-branch: Export variable `workdir' for --commit-filter + +Namhyung Kim (1): + git-remote.txt: fix wrong remote refspec + +Nguyễn Thái Ngọc Duy (3): + Break down no-lstat() condition checks in verify_uptodate() + checkout-index: remove obsolete comment + fetch-pack: check for valid commit from server + +Ori Avtalion (1): + pull: remove extra space from reflog message + +Pavan Kumar Sunkara (1): + git-config: Remove extra whitespaces + +Peter Collingbourne (1): + Documentation: git-filter-branch honors replacement refs + + +Version v1.7.6; changes since v1.7.6-rc3: +----------------------------------------- + +Junio C Hamano (1): + Git 1.7.6 + +Namhyung Kim (1): + completion: replace core.abbrevguard to core.abbrev + + +Version v1.7.6-rc3; changes since v1.7.6-rc2: +--------------------------------------------- + +Andreas Schwab (1): + builtin/gc.c: add missing newline in message + +Brandon Casey (1): + sh-i18n--envsubst.c: do not #include getopt.h + +Christof Krüger (1): + Documentation: git diff --check respects core.whitespace + +Dmitry Ivankov (1): + Fix typo: existant->existent + +Jakub Narebski (1): + gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled + +Jeff King (2): + t/Makefile: pass test opts to valgrind target properly + tests: link shell libraries into valgrind directory + +Jim Meyering (1): + plug a few coverity-spotted leaks + +Junio C Hamano (2): + t7810: avoid unportable use of "echo" + Git 1.7.6-rc3 + + +Version v1.7.6-rc2; changes since v1.7.6-rc1: +--------------------------------------------- + +Jonathan Nieder (1): + gitweb: do not misparse nonnumeric content tag files that contain a digit + +Junio C Hamano (1): + Git 1.7.6-rc2 + + +Version v1.7.6-rc1; changes since v1.7.6-rc0: +--------------------------------------------- + +Alex Riesen (1): + t3703: skip more tests using colons in file names on Windows + +Brandon Casey (2): + t7508: demonstrate status's failure to use --porcelain format with -z + builtin/commit.c: set status_format _after_ option parsing + +Jakub Narebski (4): + gitweb: Move information about installation from README to INSTALL + gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL + gitweb: Move "Requirements" up in gitweb/INSTALL + gitweb: Fix usability of $prevent_xss + +Jeff King (1): + diff_tree: disable QUICK optimization with diff filter + +Jim Meyering (1): + fetch: do not leak a refspec + +Junio C Hamano (2): + diff: futureproof "stop feeding the backend early" logic + Git 1.7.6-rc1 + + +Version v1.7.6-rc0; changes since v1.7.5.4: +------------------------------------------- + +Boris Faure (1): + Do not strip empty lines / trailing spaces from a commit message template + +Carlos Martín Nieto (1): + log: convert to parse-options + +Conrad Irwin (5): + Use a temporary index for git commit --interactive + Allow git commit --interactive with paths + Add support for -p/--patch to git-commit + Add commit to list of config.singlekey commands + Test atomic git-commit --interactive + +Csaba Henk (1): + rebase: create HEAD reflog entry when aborting + +Dan McGee (4): + Share color list between graph and show-branch + http: make curl callbacks match contracts from curl header + http-push: use const for strings in signatures + http-push: refactor curl_easy_setup madness + +Elijah Newren (3): + t6022: New test checking for unnecessary updates of renamed+modified files + t6022: New test checking for unnecessary updates of files in D/F conflicts + merge-recursive: When we detect we can skip an update, actually skip it + +Erik Faye-Lund (2): + strbuf: make sure buffer is zero-terminated + config: support values longer than 1023 bytes + +Heiko Voigt (1): + test that git status works with merge conflict in, .gitmodules + +Ingo Molnar (1): + hashcmp(): inline memcmp() by hand to optimize + +Jakub Narebski (13): + gitweb: Restructure projects list generation + gitweb: Change the way "content tags" ('ctags') are handled + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo) + gitweb: Split JavaScript for maintability, combining on build + gitweb.js: Update and improve comments in JavaScript files + gitweb.js: Provide default values for padding in padLeftStr and padLeft + gitweb.js: Extract and improve datetime handling + gitweb.js: Introduce code to handle cookies from JavaScript + gitweb.js: Provide getElementsByClassName method (if it not exists) + gitweb: Refactor generating of long dates into format_timestamp_html + gitweb: Unify the way long timestamp is displayed + gitweb: Make JavaScript ability to adjust timezones configurable + gitweb: Refactor reading and parsing config file into read_config_file + +Jay Soffian (2): + "git log -h": typofix misspelled 'suppress' + Add log.abbrevCommit config variable + +Jeff King (26): + notes: make expand_notes_ref globally accessible + revision.c: refactor notes ref expansion + notes: refactor display notes extra refs field + notes: refactor display notes default handling + revision.c: support --notes command-line option + revision.c: make --no-notes reset --notes list + format-patch: wrap email addresses after long names + add tests for various blame formats + blame: refactor porcelain output + blame: add --line-porcelain output format + t7501.8: feed a meaningful command + fetch: avoid repeated commits in mark_complete + Makefile: sort TEST_PROGRAMS list + refactor refs_from_alternate_cb to allow passing extra data + bisect: refactor sha1_array into a generic sha1 list + receive-pack: eliminate duplicate .have refs + doc: discuss textconv versus external diff drivers + remote: allow "-t" with fetch mirrors + read_in_full: always report errors + t: test subject handling in format-patch / am pipeline + mailinfo: always clean up rfc822 header folding + pretty: add pp_commit_easy function for simple callers + clean up calling conventions for pretty.c functions + format-patch: preserve subject newlines with -k + rebase: write a reflog entry when finishing + format-patch: make zero-length subject prefixes prettier + +Jens Lehmann (3): + Submodules: Don't parse .gitmodules when it contains, merge conflicts + unpack-trees: add the dry_run flag to unpack_trees_options + Teach read-tree the -n|--dry-run option + +Jim Meyering (2): + diffcore-rename.c: avoid set-but-not-used warning + plug a DIR buffer leak in rerere.c + +Johan Herland (10): + log/pretty-options: Document --[no-]notes and deprecate old notes options + Make "git notes add" more user-friendly when there are existing notes + Add several testcases for --dirstat and friends + Make --dirstat=0 output directories that contribute < 0.1% of changes + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file + Add config variable for specifying default --dirstat behavior + Allow specifying --dirstat cut-off percentage as a floating point number + New --dirstat=lines mode, doing dirstat analysis based on diffstat + Improve error handling when parsing dirstat parameters + Mark dirstat error messages for translation + +Johannes Sixt (3): + t3703: Skip tests using directory name ":" on Windows + Tweak t3102-ls-tree-wildcards to run on Windows + Windows: add a wrapper for the shutdown() system call + +John 'Warthog9' Hawley (2): + gitweb: JavaScript ability to adjust time based on timezone + gitweb.js: Add UI for selecting common timezone to display dates + +Jon Seymour (1): + git: add --info-path and --man-path options + +Jonathan Nieder (15): + revisions: split out handle_revision_pseudo_opt function + revisions: allow --glob and friends in parse_options-enabled commands + Documentation: clarify meaning of --html-path, --man-path, and --info-path + tests: eliminate unnecessary setup test assertions + tests: teach verify_parents to check for extra parents + tests: check git does not barf on merge.ff values for future versions of git + completion: move private shopt shim for zsh to __git_ namespace + t4018 (funcname patterns): make .gitattributes state easier to track + t4018 (funcname patterns): make configuration easier to track + t4018 (funcname patterns): minor cleanups + userdiff/perl: anchor "sub" and "package" patterns on the left + userdiff/perl: match full line of POD headers + userdiff/perl: catch sub with brace on second line + tests: make test_expect_code quieter on success + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters + +Junio C Hamano (53): + merge-recursive: tweak magic band-aid + git diff -D: omit the preimage of deletes + pathspec: rename per-item field has_wildcard to use_wildcard + magic pathspec: add tentative ":/path/from/top/level" pathspec support + merge: allow "-" as a short-hand for "previous branch" + magic pathspec: futureproof shorthand form + magic pathspec: add ":(icase)path" to match case insensitively + Start 1.7.6 cycle + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + merge: introduce merge.ff configuration variable + rerere: libify rerere_clear() and rerere_gc() + index_fd(): turn write_object and format_check arguments into one flag + index_fd(): split into two helper functions + convert: rename the "eol" global variable to "core_eol" + convert: give saner names to crlf/eol variables, types and functions + convert: make it safer to add conversion attributes + convert: make it harder to screw up adding a conversion attribute + git-grep: do not die upon -F/-P when grep.extendedRegexp is set. + Revert "magic pathspec: add ":(icase)path" to match case insensitively" + pathspec: drop "lone : means no pathspec" from get_pathspec() + grep: use get_pathspec() correctly + fix overstrict : diagnosis + fix overslow :/no-such-string-ever-existed diagnostics + rev/path disambiguation: further restrict "misspelled index entry" diag + Revert "completion: don't declare 'local words' to make zsh happy" + Update draft release notes to 1.7.6 + revision.c: leave a note for "a lone :" enhancement + Update draft release notes to 1.7.6 + Bigfile: teach "git add" to send a large file straight to a pack + Declare lookup_replace_object() in cache.h, not in commit.h + t6050: make sure we test not just commit replacement + read_sha1_file(): get rid of read_sha1_file_repl() madness + inline lookup_replace_object() calls + read_sha1_file(): allow selective bypassing of replacement mechanism + Sync release notes for 1.7.6 to exclude what are in maintenance track + git-grep: update tests now regexp type is "last one wins" + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS + Update release notes to 1.7.6 + notes remove: allow removing more than one + notes remove: --ignore-missing + notes remove: --stdin reads from the standard input + show: --ignore-missing + Revert "Merge branch 'en/merge-recursive'" + Update draft release notes to 1.7.6 + Update 1.7.6 draft release notes + require-work-tree wants more than what its name says + compat/fnmatch/fnmatch.c: give a fall-back definition for NULL + Update 1.7.6 draft release notes + log: --quiet should serve as synonym to -s + Update draft release notes to 1.7.6 + +Luke Diamand (3): + git-p4: add option to preserve user names + git-p4: small improvements to user-preservation + git-p4: warn if git authorship won't be retained + +Marius Storm-Olsen (1): + Automatically autoload bashcompinit for ZSH, when needed + +Martin von Zweigbergk (34): + rebase: clearer names for directory variables + rebase: refactor reading of state + rebase: read state outside loop + rebase: remove unused rebase state 'prev_head' + rebase: improve detection of rebase in progress + rebase: act on command line outside parsing loop + rebase: stricter check of standalone sub command + rebase: align variable names + rebase: align variable content + rebase: factor out command line option processing + rebase -i: remove now unnecessary directory checks + rebase: reorder validation steps + rebase: factor out reference parsing + rebase: factor out clean work tree check + rebase: factor out call to pre-rebase hook + rebase -i: support --stat + rebase: remove $branch as synonym for $orig_head + rebase: extract merge code to new source file + rebase: extract am code to new source file + rebase: show consistent conflict resolution hint + rebase -i: align variable names + rebase: make -v a tiny bit more verbose + rebase: factor out sub command handling + rebase: extract code for writing basic state + rebase: remember verbose option + rebase: remember strategy and strategy options + rebase -m: remember allow_rerere_autoupdate option + rebase -m: don't print exit code 2 when merge fails + git-rebase--am: remove unnecessary --3way option + rebase -i: don't read unused variable preserve_merges + rebase -i: remove unnecessary state rebase-root + rebase: use @{upstream} if no upstream specified + Makefile: do not install sourced rebase scripts + rebase: define options in OPTIONS_SPEC + +Mathias Lafeldt (1): + t/test-lib.sh: minor readability improvements + +Michael Haggerty (1): + git-svn: add an option to skip the creation of empty directories + +Michael J Gruber (7): + contrib/completion: --notes, --no-notes + rev-list --count: separate count for --cherry-mark + t1020: test !alias in subdirectory + handle_alias: provide GIT_PREFIX to !alias + config: define and document exit codes + config: Give error message when not changing a multivar + sh-18n: quell "unused variable" warning + +Michael Schubert (2): + tag: disallow '-' as tag name + ls-remote: the --exit-code option reports "no matching refs" + +Michał Kiedrowicz (11): + Documentation: Add --line-number to git-grep synopsis + contrib/completion: --line-number to git grep + grep: Put calls to fixmatch() and regmatch() into patmatch() + grep: Fix a typo in a comment + grep: Extract compile_regexp_failed() from compile_regexp() + git-grep: Learn PCRE + configure: Check for libpcre + grep: Add basic tests + git-grep: Bail out when -P is used with -F or -E + git-grep: Update tests (mainly for -P) + git-grep: Fix problems with recently added tests + +Namhyung Kim (1): + blame: add --abbrev command line option and make it honor core.abbrev + +Nguyễn Thái Ngọc Duy (8): + Reimplement read_tree_recursive() using tree_entry_interesting() + Convert read_tree{,_recursive} to support struct pathspec + Improve tree_entry_interesting() handling code + setup: return correct prefix if worktree is '/' + Kill off get_relative_cwd() + t1011: fix sparse-checkout initialization and add new file + sparse checkout: do not eagerly decide the fate for whole directory + t3703, t4208: add test cases for magic pathspec + +Nicolas Morey-Chaisemartin (1): + submodule: Add --force option for git submodule update + +Rafael Gieschke (1): + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd + +Ramsay Allan Jones (9): + Makefile: Use cgcc rather than sparse in the check target + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning + sparse: Fix some "Using plain integer as NULL pointer" warnings + sparse: Fix an "symbol 'format_subject' not declared" warning + sparse: Fix an "symbol 'merge_file' not decared" warning + sparse: Fix errors due to missing target-specific variables + sparse: Fix some "symbol not declared" warnings + setup.c: Fix some "symbol not declared" sparse warnings + config.c: Remove unused git_config_global() function + +René Scharfe (1): + strbuf: clarify assertion in strbuf_setlen() + +SZEDER Gábor (3): + completion: don't modify the $cur variable in completion functions + completion: remove unnecessary _get_comp_words_by_ref() invocations + completion: don't declare 'local words' to make zsh happy + +Sebastien Cevey (3): + gitweb: Split git_project_list_body in two functions + gitweb: Modularized git_get_project_description to be more generic + gitweb: Optional grouping of projects by category + +Tay Ray Chuan (1): + t5541-http-push: add test for chunked + +Ævar Arnfjörð Bjarmason (5): + git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() + git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers + git-sh-i18n.sh: add GIT_GETTEXT_POISON support + Makefile: add xgettext target for *.sh files + git-sh-i18n--envsubst: add SYNOPSIS section to the documentation + + +Version v1.7.5.4; changes since v1.7.5.3: +----------------------------------------- + +Brandon Casey (2): + Documentation/technical/api-diff.txt: correct name of diff_unmerge() + git-submodule.sh: separate parens by a space to avoid confusing some shells + +Jeff King (8): + config: make environment parsing routines static + git_config: don't peek at global config_parameters + config: always parse GIT_CONFIG_PARAMETERS during git_config + read_gitfile_gently: use ssize_t to hold read result + docs: minor grammar fixes to git-status + docs: update status --porcelain format + docs: make sure literal "->" isn't converted to arrow + docs: fix some antique example output + +Jim Meyering (3): + rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' + remove tests of always-false condition + diffcore-rename.c: avoid set-but-not-used warning + +Jonathan Nieder (3): + tests: check error message from run_command + run-command: handle short writes and EINTR in die_child + Documentation: do not misinterpret refspecs as bold text + +Junio C Hamano (26): + builtin/diff.c: remove duplicated call to diff_result_code() + diffcore-rename: refactor "too many candidates" logic + diffcore-rename: record filepair for rename src + diffcore-rename: fall back to -C when -C -C busts the rename limit + i18n: do not overuse C_LOCALE_OUTPUT + i18n: .git file is not a human readable message (t5601) + i18n: use test_i18ncmp in t1200 and t2200 + i18n: do not overuse C_LOCALE_OUTPUT (grep) + i18n: use test_i18ngrep in lib-httpd and t2019 + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 + i18n: use test_i18ngrep in t7201 + i18n: use test_i18ncmp in t7500 + i18n: use test_i18ngrep in t7501 + i18n: use test_i18ngrep and test_i18ncmp in t7502 + i18n: use test_i18ngrep in t7506 + i18n: use test_i18n{grep,cmp} in t7508 + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 + handle_options(): do not miscount how many arguments were used + userformat_find_requirements(): find requirement for the correct format + config.mak.in: allow "configure --sysconfdir=/else/where" + Start 1.7.5.4 draft release notes + Git 1.7.5.4 + +Mathias Lafeldt (1): + t/README: unify documentation of test function args + +Ramkumar Ramachandra (4): + Documentation: Add filter..* to config + Documentation: Move diff..* from config.txt to diff-config.txt + Documentation: Add diff..* to config + Documentation: Allow custom diff tools to be specified in 'diff.tool' + +Thomas Rast (1): + add -i: ignore terminal escape sequences + +Valentin Haenel (5): + config.txt: 'interactive.singlekey; is used by... + git-add.txt: document 'interactive.singlekey' + git-stash.txt: better docs for '--patch' + git-checkout.txt: better docs for '--patch' + git-reset.txt: better docs for '--patch' + +Ævar Arnfjörð Bjarmason (7): + i18n: mark merge "Could not read from" message for translation + i18n: mark merge "upstream" messages for translation + i18n: mark merge CHERRY_PICK_HEAD messages for translation + i18n: mark clone nonexistent repository message for translation + i18n: mark checkout --detach messages for translation + i18n: mark checkout plural warning for translation + i18n: mark init-db messages for translation + + +Version v1.7.5.3; changes since v1.7.5.2: +----------------------------------------- + +Felipe Contreras (1): + git-completion: fix regression in zsh support + +Fraser Tweedale (1): + gitweb: supply '-n' to gzip for identical output + +Jeff King (8): + send-pack: unbreak push over stateless rpc + cherry-pick: handle root commits with external strategies + revert: allow reverting a root commit + t3503: test cherry picking and reverting root commits + connect: treat generic proxy processes like ssh processes + connect: let callers know if connection is a socket + send-pack: avoid deadlock on git:// push with failed pack-objects + test core.gitproxy configuration + +Jim Meyering (1): + do not read beyond end of malloc'd buffer + +Johannes Sixt (3): + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird + send-pack: avoid deadlock when pack-object dies early + Honor $(prefix) set in config.mak* when defining ETC_GIT* + +Jonathan Nieder (5): + Revert "t0081 (line-buffer): add buffering tests" + Documentation: explain how to check for patch corruption + Documentation: hints for sending patches inline with Thunderbird + Documentation: publicize KMail hints for sending patches inline + Documentation: publicize hints for sending patches with GMail + +Junio C Hamano (4): + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" + setup_revisions(): take pathspec from command line and --stdin correctly + sideband_demux(): fix decl-after-stmt + Git 1.7.5.3 + +Kacper Kornet (1): + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir + +Michael J Gruber (2): + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff + git-svn: Fix git svn log --show-commit + +Nguyễn Thái Ngọc Duy (1): + init/clone: remove short option -L and document --separate-git-dir + +Rafael Gieschke (1): + copy_gecos: fix not adding nlen to len when processing "&" + +Stefan Sperling (1): + remove noise and inaccuracies from git-svn docs + + +Version v1.7.5.2; changes since v1.7.5.1: +----------------------------------------- + +Andrew Wong (1): + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff + +Brian Gernhardt (1): + t/annotate-tests: Use echo & cat instead of sed + +Carlos Martín Nieto (2): + format-patch: don't pass on the --quiet flag + format-patch: document --quiet option + +Ciaran Jessup (1): + Pass empty file to p4merge where no base is suitable. + +Dima Sharov (1): + shell: add missing initialization of argv0_path + +Guy Rouillier (1): + Look for password in both CVS and CVSNT password files. + +Jakub Narebski (2): + git-instaweb: Simplify build dependency on gitweb + Remove gitweb/gitweb.cgi and other legacy targets from main Makefile + +Jeff King (3): + pretty: quote rfc822 specials in email addresses + add tests for merge-index / merge-one-file + merge-one-file: fix broken merges with alternate work trees + +Jim Meyering (1): + Documentation/git-fsck.txt: fix typo: unreadable -> unreachable + +Johan Herland (1): + t5400: Fix a couple of typos + +Jonathan Nieder (4): + Restructure documentation for git-merge-base. + Documentation: describe the format of messages with inline patches + add, merge, diff: do not use strcasecmp to compare config variable names + provide a copy of the LGPLv2.1 + +Jonathon Mah (1): + mergetool: Teach about submodules + +Josh Stone (1): + blame: tolerate bogus e-mail addresses a bit better + +João Britto (1): + Remove duplicated "is a" + +Junio C Hamano (19): + test: use $_z40 from test-lib + diff.c: return filepair from diff_unmerge() + diff: remove often unused parameters from diff_unmerge() + diff-files: show unmerged entries correctly + Fix "add -u" that sometimes fails to resolve unmerged paths + add -p: 'q' should really quit + t3701: Editing a split hunk in an "add -p" session + add--interactive.perl: factor out repeated --recount option + "add -p": work-around an old laziness that does not coalesce hunks + t3701: fix here document + merge: make branch..mergeoptions correctly override merge.