diff --git a/debian/README.emacs b/debian/README.emacs new file mode 100644 index 0000000..e893018 --- /dev/null +++ b/debian/README.emacs @@ -0,0 +1,24 @@ +The git-el package previously provided the following modules for Emacs +support: + +* git.el: + + Status manager that displayed the state of all the files of the + project and provided access to the most frequently used Git + commands. Its interface was modeled after the pcl-cvs mode. + + Modern alternatives include Magit, available from the elpa-magit + package, and the VC-mode backend for Git that is part of standard + Emacs distributions. + +* git-blame.el: + + A wrapper for "git blame" written before Emacs's own vc-annotate + mode, which can be invoked using C-x v g, learned to invoke + "git blame". + +* vc-git.el: + + This file used to contain the VC-mode backend for Git, but it is no + longer distributed with Git. It is now maintained as part of Emacs + and included in standard Emacs distributions. diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..ce13c78 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,85 @@ +Git sources for Debian +---------------------- + +The git Debian package sources are available through git, and +through 'apt-get source git'. Getting the sources through git +should be preferred: + + # apt-get install git # if not yet done + + $ git clone https://repo.or.cz/r/git/debian.git/ git + $ cd git + +After cloning the repository, you have checked out the debian-sid +branch, ready to be used by dpkg-buildpackage, e.g. + + $ dpkg-buildpackage -i -rfakeroot -uc -us + +If you want to make changes in the ./debian/ subdirectory, this is the +correct branch to work on. After making changes, document them in +debian/changelog, and commit through 'git add' and 'git commit', or 'git +commit -a', or similar. If you think the changes should be incorporated +into the standard Debian package, create the patch[es] through 'git +format-patch', and send them to the Debian Bug Tracking System, e.g. + + $ vi debian/rules + $ debchange -pi + $ git commit -a + $ git format-patch HEAD^ + + +If you want to make changes to the upstream git sources, first checkout +the release+patches branch + + $ git checkout -b release+patches origin/release+patches + +The release+patches branch holds patches on top of the current release +version that is packaged for Debian/unstable. The current release +version is available in the release branch. If you are interested, you +can checkout this branch too + + $ git checkout -b release origin/release + +When releasing a new Debian package based on a new upstream release, the +release branch will be fastforwarded, and the release+patches branch is +rewound and rebased on the new HEAD of the release branch. This is done +by + + $ git checkout release + $ git merge v1.6.5 + $ git checkout release+patches + $ git rebase release + +You generally don't need to do that, but beware that the release+patches +branch is rewound occasionally. + +After checking out the release+patches branch, make the desired changes +to the upstream sources, and commit them. To integrate the changes into +the Debian package, extract these changes, and change to the debian-sid +branch (Note: the file extension for the patches is '.diff', use 'git +config --add format.suffix .diff' to make that the default) + + $ git format-patch release..release+patches + $ git checkout debian-sid + +Now move the extracted patches into the debian/patches/ directory, add +their filenames to debian/patches/series, add a meaningful message to +debian/changelog, and commit the changes to the debian-sid branch: + + $ ls ????-*.diff >> debian/patches/series + $ mv ????-*.diff debian/patches/ + $ git add debian/patches + $ debchange -pi + $ git add debian/changelog + $ git commit + +Again, if you think the changes should be incorporated into the standard +Debian package, create the patch[es] from the debian-sid branch through +'git format-patch', send them to the Debian Bug Tracking System. + +There's a mailing list to coordinate work on the git-core packages, if +you're interested in helping please subscribe to the + mailing list by sending an email to +. + + -- Gerrit Pape Sat, 10 Apr 2010 12:28:52 +0000 diff --git a/debian/apache2/gitweb.conf b/debian/apache2/gitweb.conf new file mode 100644 index 0000000..cb914bc --- /dev/null +++ b/debian/apache2/gitweb.conf @@ -0,0 +1,19 @@ + + + + Define ENABLE_GITWEB + + + Define ENABLE_GITWEB + + + + + + Alias /gitweb /usr/share/gitweb + + + Options +FollowSymLinks +ExecCGI + AddHandler cgi-script .cgi + + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..df2dffc --- /dev/null +++ b/debian/changelog @@ -0,0 +1,4445 @@ +git (1:2.47.2-0.2) trixie; urgency=medium + + * Non-maintainer upload. + * debian/rules: remove overly strict check for license file + content matching base-files. This unbreaks the build on + builders with an updated copy of the GPLv2 text (thx + Santiago Vila; closes: #1106311). + + -- Sebastian Andrzej Siewior Sun, 22 Jun 2025 13:21:11 +0200 + +git (1:2.47.2-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * new upstream release (see Documentation/RelNotes/2.47.2.txt; addresses + CVE-2024-50349 and CVE-2024-52006; Closes: #1093042). + + -- Salvatore Bonaccorso Sun, 19 Jan 2025 09:06:17 +0100 + +git (1:2.47.1-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.46.0.txt, RelNotes/2.47.0.txt). + * new upstream point release (see RelNotes/2.47.1.txt). + * remove unsafe and under-maintained packages that install an + unsecured git-daemon services (thx Chris Hofstaedtler; closes: + #1078778, #1020284). + + -- Jonathan Nieder Thu, 02 Jan 2025 13:12:25 +0100 + +git (1:2.45.2-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Revert my two previous NMUs as I don't have the time to fully clean + up the situation. Reopens: #1020284 #1078778 + Closes: #1088019 + + -- Chris Hofstaedtler Sun, 22 Dec 2024 16:52:50 +0100 + +git (1:2.45.2-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * git-daemon-run.postinst: Avoid hard failure when update-service + is not installed yet. + * git-daemon-run.postrm: stop passing -f to deluser (Closes: #1020284) + + -- Chris Hofstaedtler Fri, 08 Nov 2024 17:57:18 +0100 + +git (1:2.45.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Demote "runit" dependency to Recommends. + Demoting Depends: runit to Recommends: should have no effect on default + installs (apt will install Recommends by default), and people wanting to + use runit should have it installed already. (Closes: #1078778) + + -- Chris Hofstaedtler Sun, 13 Oct 2024 14:16:01 +0200 + +git (1:2.45.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.45.2.txt). + * debian/patches/*: remove; applied upstream. + + -- Jonathan Nieder Sun, 16 Jun 2024 15:40:09 +0000 + +git (1:2.45.1-1) unstable; urgency=medium + + * new upstream release (see RelNotes/2.44.0.txt, RelNotes/2.45.0.txt). + * new upstream point release (see RelNotes/2.45.1.txt; addresses + CVE-2024-32002, CVE-2024-32004, CVE-2024-32020, CVE-2024-32021 and + CVE-2024-32465; closes: #1071160). + * debian/patches/0001..0007: new from upstream: followups intended + for v2.45.2 to avoid regressions from the fixes included in + v2.45.1 (thx Johannes Schindelin). + + -- Jonathan Nieder Mon, 20 May 2024 03:36:58 +0000 + +git (1:2.43.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.43.0.txt). + + -- Jonathan Nieder Sun, 26 Nov 2023 17:32:42 -0800 + +git (1:2.42.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.41.0.txt, RelNotes/2.42.0.txt). + + -- Jonathan Nieder Wed, 27 Sep 2023 09:55:42 -0700 + +git (1:2.40.1-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.40.1.txt; addresses + CVE-2023-25652, CVE-2023-25815 CVE-2023-29007). + + -- Jonathan Nieder Tue, 25 Apr 2023 10:16:34 -0700 + +git (1:2.40.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.40.0.txt). + * debian/git-doc.doc-base.{git-index-format,git-pack-format,git-protocol}: + remove from documentation index, as the main git(1) reference + manual is the main entry point to find these. + + -- Jonathan Nieder Mon, 20 Mar 2023 16:50:00 -0700 + +git (1:2.39.2-1.1) unstable; urgency=medium + + * Non-maintainer upload (only changes to git-doc). + * Correct paths in git-doc doc-base control files (Closes: #1023255) + + -- Matthew Vernon Tue, 28 Feb 2023 09:25:32 +0000 + +git (1:2.39.2-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.39.2.txt). Addresses + CVE-2023-22490 and CVE-2023-23946. + + -- Jonathan Nieder Wed, 15 Feb 2023 17:08:12 -0800 + +git (1:2.39.1-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream stable release (Closes: #1029114) + Fixes CVE-2022-23521 and CVE-2022-41903. + + -- Aron Xu Thu, 26 Jan 2023 13:43:04 +0800 + +git (1:2.39.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.39.0.txt). + + -- Jonathan Nieder Mon, 12 Dec 2022 12:53:44 -0800 + +git (1:2.38.1-1) unstable; urgency=medium + + * new upstream release (closes: #1022046; see RelNotes/2.38.0.txt, + RelNotes/2.38.1.txt). + * Addresses the security issue CVE-2022-39253: cloning an + attacker-controlled local repository could store arbitrary files + in the ".git" directory of the destination repository. + + Thanks to Cory Snider of Mirantis for reporting this + vulnerability and Taylor Blau for the mitigation. + + * Addresses CVE-2022-39260: a long command string passed to a `git + shell` configured to support custom commands could overflow and + run arbitrary code. + + Thanks to Kevin Backhouse of GitHub for reporting this + vulnerability and Kevin Backhouse, Jeff King, and Taylor Blau + for mitigating it. + + -- Jonathan Nieder Mon, 31 Oct 2022 18:32:00 -0700 + +git (1:2.37.2-1) unstable; urgency=low + + * new upstream release (closes: #1016723; see RelNotes/2.37.0.txt, + RelNotes/2.37.1.txt, RelNotes/2.37.2.txt). + + -- Jonathan Nieder Fri, 12 Aug 2022 19:27:24 -0700 + +git (1:2.36.1-1) unstable; urgency=low + + * new upstream point release (closes: #1010720; see + RelNotes/2.36.1.txt). + + -- Jonathan Nieder Mon, 09 May 2022 12:43:15 -0700 + +git (1:2.36.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.36.0.txt). + + -- Jonathan Nieder Fri, 22 Apr 2022 16:43:03 -0700 + +git (1:2.35.2-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.35.2.txt). + * Addresses the security issue CVE-2022-24765: Git users might + have found themselves unexpectedly in a Git worktree, e.g. when + another user created a repository in `/tmp/.git`, in a mounted + network drive or in a scratch space. Having a Git-aware prompt + that runs `git status` (or `git diff`) and navigating to a + directory which is supposedly not a Git worktree, or opening + such a directory in an IDE with Git support such as VS Code, + could then run commands specified by that other user. + + Thanks to 俞晨东 for discovering this vulnerability and + Johannes Schindelin for the mitigation. + + -- Jonathan Nieder Tue, 12 Apr 2022 21:25:57 -0700 + +git (1:2.35.1-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.35.0.txt, RelNotes/2.35.1.txt). + + -- Jonathan Nieder Mon, 14 Feb 2022 08:24:39 -0800 + +git (1:2.34.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.34.1.txt). + + -- Jonathan Nieder Mon, 29 Nov 2021 11:04:56 -0800 + +git (1:2.34.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.34.0.txt). + + -- Jonathan Nieder Sat, 20 Nov 2021 13:14:45 -0800 + +git (1:2.33.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.33.1.txt). + + -- Jonathan Nieder Mon, 25 Oct 2021 15:02:19 -0700 + +git (1:2.33.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.33.0.txt). + + -- Jonathan Nieder Mon, 16 Aug 2021 17:54:01 -0700 + +git (1:2.32.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.32.0.txt). + + -- Jonathan Nieder Sun, 06 Jun 2021 14:34:33 -0700 + +git (1:2.32.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + * remove git-el package (closes: #987264, #984931). Since version + 1:2.18.0~rc2-1, it only contained modules that error out with a + message pointing to other Emacs packages. Nowadays users can + use the README.emacs file from the git package for that instead. + + -- Jonathan Nieder Mon, 31 May 2021 15:02:28 -0700 + +git (1:2.32.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.32.0.txt). + + -- Jonathan Nieder Thu, 20 May 2021 13:20:15 -0700 + +git (1:2.31.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.31.1.txt). + * install dashed commands to /usr/lib again (thx Sven Joachim; + closes: #985416). + + -- Jonathan Nieder Mon, 19 Apr 2021 09:23:57 -0700 + +git (1:2.31.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.31.0.txt). + * install dashed commands to /usr/libexec instead of /usr/lib (thx + Chris Lamb for suggesting it through lintian). + * remove compatibility code and NEWS.Debian entries that supported + upgrades from versions before 1.7.9.5 (the version in Ubuntu + 12.04, which reached the end of extended security maintenance in + April, 2019). + + -- Jonathan Nieder Mon, 15 Mar 2021 19:32:17 -0700 + +git (1:2.30.2-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.30.2.txt). + + -- Jonathan Nieder Tue, 09 Mar 2021 17:45:38 -0800 + +git (1:2.30.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.30.1.txt). + + -- Jonathan Nieder Tue, 16 Feb 2021 21:55:22 -0800 + +git (1:2.30.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.30.0.txt). + + -- Jonathan Nieder Mon, 28 Dec 2020 16:22:30 -0800 + +git (1:2.30.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Wed, 23 Dec 2020 15:17:54 -0800 + +git (1:2.30.0~rc1-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.30.0.txt). + + -- Jonathan Nieder Mon, 21 Dec 2020 13:58:04 -0800 + +git (1:2.29.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.29.2.txt). + * debian/copyright: remove unused BSD-2-Clause text. The last part + of Git under that license was removed in v2.29.0. + + -- Jonathan Nieder Mon, 02 Nov 2020 09:33:37 -0800 + +git (1:2.29.1-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.29.0.txt). + * update debian/copyright. + * debian/control: Build-Depends: debhelper-compat (= 10) + * debian/rules: run "dh --without autoreconf" to speed up build, + since we don't use the autotools-generated configure script. + * git-el: install elisp for the "emacs" flavor, too (thx Zack Weinberg; + closes: #972871). Breaks: emacsen-common (<< 3.0.0~) to avoid + triggering on older systems where "emacs" was a virtual package. + + -- Jonathan Nieder Mon, 26 Oct 2020 17:25:55 -0700 + +git (1:2.28.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.28.0.txt). + + -- Jonathan Nieder Mon, 27 Jul 2020 11:02:01 -0700 + +git (1:2.28.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Wed, 22 Jul 2020 17:36:57 -0700 + +git (1:2.28.0~rc1-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Fri, 17 Jul 2020 18:40:53 -0700 + +git (1:2.28.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.28.0.txt). + + -- Jonathan Nieder Mon, 13 Jul 2020 15:03:55 -0700 + +git (1:2.27.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.27.0.txt). + + -- Jonathan Nieder Mon, 01 Jun 2020 10:05:06 -0700 + +git (1:2.27.0~rc2-1) unstable; urgency=low + + * new upstream release candidate (closes: #757402). + + -- Jonathan Nieder Tue, 26 May 2020 14:27:25 -0700 + +git (1:2.27.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.27.0.txt). + + -- Jonathan Nieder Mon, 18 May 2020 16:57:41 -0700 + +git (1:2.26.2-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.26.2.txt). + * Addresses the security issue CVE-2020-11008. + + With a crafted URL that contains a newline or empty host, or + lacks a scheme, the credential helper machinery can be fooled + into providing credential information that is not appropriate + for the protocol in use and host being contacted. + + Unlike the vulnerability fixed in 2.26.1, the credentials are + not for a host of the attacker's choosing. Instead, they are + for an unspecified host, based on how the configured + credential helper handles an absent "host" parameter. + + The attack has been made impossible by refusing to work with + underspecified credential patterns. + + Thanks to Carlo Arenas for reporting that Git was still + vulnerable, Felix Wilhelm for providing the proof of concept + demonstrating this issue, and Jeff King for promptly providing + a corrected fix. + + Tested using the proof of concept at + https://crbug.com/project-zero/2021. + + -- Jonathan Nieder Mon, 20 Apr 2020 10:44:09 -0700 + +git (1:2.26.1-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.26.1.txt). + * Addresses the security issue CVE-2020-5260. + + With a crafted URL that contains a newline, the credential + helper machinery can be fooled to supply credential information + for the wrong host. The attack has been made impossible by + forbidding a newline character in any value passed via the + credential protocol. + + Thanks to Felix Wilhelm of Google Project Zero for finding + this vulnerability and Jeff King for fixing it. + + -- Jonathan Nieder Tue, 14 Apr 2020 10:29:38 -0700 + +git (1:2.26.0-2) unstable; urgency=low + + * fixes to the (newly default) rebase --merge backend: + * honor GIT_REFLOG_ACTION (thx Ian Jackson and Elijah Newren; + closes: #955152). + * avoid "nothing to do" error when fast-forwarding a branch with + rebase.abbreviateCommands=true (thx Jan Alexander Steffens and + Alban Gruin). + * debian/control: downgrade Recommends by git-all on git-daemon-run + to Suggests. The git-all package is a "batteries included" full + installation of Git. Automatically running a daemon is not useful + to most of its users. + + -- Jonathan Nieder Tue, 14 Apr 2020 10:09:37 -0700 + +git (1:2.26.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.26.0.txt). + + -- Jonathan Nieder Mon, 23 Mar 2020 13:19:36 -0700 + +git (1:2.26.0~rc2-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.26.0.txt). + + -- Jonathan Nieder Mon, 16 Mar 2020 21:17:23 -0700 + +git (1:2.25.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.25.1.txt). + * update debian/copyright. + * debian/control: remove Gerrit Pape from the Maintainer field, + as requested. Thanks to Gerrit for putting together this + package in a way that has been pleasant to maintain. + * debian/rules: use "dpkg-architecture" instead of "uname -m" to + retrieve host arch. This makes the resulting "git version + --build-options" more predictable when building for i386 on an + amd64 machine (thx to Ceridwen for detecting this in reprotest). + + -- Jonathan Nieder Tue, 18 Feb 2020 17:26:36 -0800 + +git (1:2.25.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.25.0.txt). + * build against Python 3 (thx Steve Langasek, closes: #948832). + + -- Jonathan Nieder Tue, 14 Jan 2020 02:58:47 +0000 + +git (1:2.25.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Wed, 08 Jan 2020 16:08:27 -0800 + +git (1:2.25.0~rc1-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Fri, 03 Jan 2020 15:12:18 -0800 + +git (1:2.25.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.25.0.txt). + + -- Jonathan Nieder Fri, 27 Dec 2019 15:08:51 -0800 + +git (1:2.24.1-1) unstable; urgency=low + + * update to use upstream tarball for 2.24.1. + + -- Jonathan Nieder Tue, 10 Dec 2019 13:21:59 -0800 + +git (1:2.24.0-2) unstable; urgency=high + + * new upstream point release (see RelNotes/2.24.1.txt). + * Addresses the security issues CVE-2019-1348, CVE-2019-1349, + CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, + CVE-2019-1354, and CVE-2019-1387. + + Credit for finding these vulnerabilities goes to Microsoft + Security Response Center, in particular to Nicolas Joly. Fixes + were provided by Jeff King and Johannes Schindelin with help + from Garima Singh. + + * Addresses CVE-2019-19604, arbitrary code execution via the + "update" field in .gitmodules. + + Credit for finding this vulnerability goes to Joern + Schneeweisz from GitLab. + + -- Jonathan Nieder Mon, 09 Dec 2019 06:20:25 +0000 + +git (1:2.24.0-1) unstable; urgency=medium + + * new upstream release (see RelNotes/2.24.0.txt). + + -- Jonathan Nieder Sun, 03 Nov 2019 22:16:20 -0800 + +git (1:2.24.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Wed, 30 Oct 2019 12:52:19 -0700 + +git (1:2.24.0~rc1-1) unstable; urgency=medium + + * new upstream release candidate. + * test-tool: read --total as an int, not uint64 (thx John Paul Adrian + Glaubitz; closes: #942674) + + -- Jonathan Nieder Thu, 24 Oct 2019 15:44:01 -0700 + +git (1:2.24.0~rc0-1) unstable; urgency=medium + + * new upstream release candidate (see RelNotes/2.24.0.txt). + + -- Jonathan Nieder Fri, 18 Oct 2019 15:15:37 -0700 + +git (1:2.23.0-1) unstable; urgency=medium + + * new upstream release (see RelNotes/2.23.0.txt). + + -- Jonathan Nieder Sun, 18 Aug 2019 16:58:15 -0700 + +git (1:2.23.0~rc1-1) unstable; urgency=low + + * new upstream release candidate. + * tests: sort output of hashmap iteration (closes: #933519) + + -- Jonathan Nieder Fri, 02 Aug 2019 17:21:22 -0700 + +git (1:2.23.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.23.0.txt). + + -- Jonathan Nieder Mon, 29 Jul 2019 17:07:53 -0700 + +git (1:2.22.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.21.0.txt, RelNotes/2.22.0.txt). + + -- Jonathan Nieder Mon, 08 Jul 2019 10:50:51 -0700 + +git (1:2.20.1-2) unstable; urgency=low + + * package git-gui: actually Suggests: meld for mergetool support; + describe what meld is used for in package description (thx Jens + Reyer; closes: #707790). + * package gitweb: Depends: libhttp-date-perl | libtime-parsedate-perl + instead of ... | libtime-modules-perl (thx gregor herrmann; closes: + #879165). + * debian/control: use https in Vcs-Browser URL. + * debian/rules: build and test quietly if DEB_BUILD_OPTIONS=terse. + * debian/control: Standards-Version: 4.3.0.1. + + -- Jonathan Nieder Mon, 21 Jan 2019 22:32:28 -0800 + +git (1:2.20.1-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.20.1.txt). + * package git-gui: Suggests: meld for mergetool support (thx Jens + Reyer; closes: #707790). + + -- Jonathan Nieder Sun, 16 Dec 2018 16:53:30 -0800 + +git (1:2.20.0-1) unstable; urgency=medium + + * new upstream release (see RelNotes/2.20.0.txt). + * package git: Recommends: ca-certificates for https support (thx HJ; + closes: #915644). + + -- Jonathan Nieder Mon, 10 Dec 2018 11:07:26 -0800 + +git (1:2.20.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + * rebase: specify 'rebase -i' in reflog for interactive rebase + (closes: #914695). + + -- Jonathan Nieder Sun, 02 Dec 2018 12:11:19 -0800 + +git (1:2.20.0~rc1-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.20.0.txt). + * debian/rules: target clean: don't remove t/t4256/1/mailinfo.c.orig. + + -- Jonathan Nieder Sun, 25 Nov 2018 11:47:53 -0800 + +git (1:2.19.2-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.19.2.txt). + * run-command: do not fall back to cwd when command is not in $PATH. + + -- Jonathan Nieder Thu, 22 Nov 2018 14:48:49 -0800 + +git (1:2.19.1-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.19.1.txt, + CVE-2018-17456). + + -- Jonathan Nieder Fri, 05 Oct 2018 10:10:45 -0700 + +git (1:2.19.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.19.0.txt). + * debian/patches/0001-*, 0002-*: remove; applied upstream. + + -- Jonathan Nieder Mon, 10 Sep 2018 13:33:45 -0700 + +git (1:2.19.0~rc2-2) unstable; urgency=low + + * debian/patches: + * 0001-http-backend-allow-empty-CONTENT_LENGTH: new from + upstream: http-backend: treat empty CONTENT_LENGTH as absent + (closes: #907587). + * 0002-Revert-Merge-branch-sb-submodule-core-worktree.diff: new + from upstream: stop setting and unsetting core.worktree in + submodules, since the code to do so does not handle submodules + with an embedded .git directory (thx Allan Sandfeld Jensen). + + -- Jonathan Nieder Sun, 09 Sep 2018 19:08:55 -0700 + +git (1:2.19.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Tue, 04 Sep 2018 15:47:54 -0700 + +git (1:2.19.0~rc1-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.19.0.txt). + * debian/control: Standards-Version: 4.1.5.0. + + -- Jonathan Nieder Tue, 28 Aug 2018 13:48:50 -0700 + +git (1:2.18.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.18.0.txt). + + -- Jonathan Nieder Thu, 21 Jun 2018 15:25:50 -0700 + +git (1:2.18.0~rc2-2) unstable; urgency=low + + * debian/control: Breaks: dgit (<< 5.1~) that lacks support + for working-tree-encoding attribute (thx Ian Jackson; + closes: #901897). + + -- Jonathan Nieder Wed, 20 Jun 2018 10:22:51 -0700 + +git (1:2.18.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + * debian/README.emacs: describe removed emacs support. + * debian/control: package git-el: describe transitional + modules; Recommends: elpa-magit. + + -- Jonathan Nieder Mon, 18 Jun 2018 09:19:59 -0700 + +git (1:2.17.1-1) unstable; urgency=high + + * new upstream point release to fix CVE-2018-11235, arbitary code + execution via submodule names in .gitmodules (see RelNotes/2.17.1.txt). + + -- Jonathan Nieder Mon, 28 May 2018 17:37:54 -0700 + +git (1:2.17.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.17.0.txt). + * debian/rules: add NO_USE_CPAN_FALLBACKS=1 to OPTS to avoid + installing bundled copies of perl modules. + * debian/control: Build-Depends: libmailtools-perl, liberror-perl; + git-email: Depends: libmailtools-perl for Mail::Address. + + -- Jonathan Nieder Mon, 02 Apr 2018 12:58:14 -0700 + +git (1:2.16.3-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.16.3.txt). + + -- Jonathan Nieder Fri, 23 Mar 2018 09:56:37 -0700 + +git (1:2.16.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.16.2.txt). + * debian/control: correct spelling of openssh-client in Breaks + relation. + + -- Jonathan Nieder Fri, 23 Feb 2018 13:53:02 -0800 + +git (1:2.16.1-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.16.txt, RelNotes/2.16.1.txt). + * debian/control: Breaks: openssh-client (<< 1:6.8) since the latter + lacks support for the "-G" option (thx Bryan Turner; see + https://crbug.com/git/7). + * debian/patches/git-gui-Sort-entries-in-optimized-tclIndex.diff: + remove; applied upstream. + * debian/rules: do not install contrib/**/.gitattributes to + /usr/share/doc (thx Paul Wise and Bastien Roucaries for suggesting + it through lintian). + + -- Jonathan Nieder Mon, 05 Feb 2018 12:27:37 -0800 + +git (1:2.15.1-3) unstable; urgency=low + + * debian/rules: remove remnants of git-core package that prevented + building twice in a row (thx Andreas Beckmann; closes: #884890). + + -- Jonathan Nieder Fri, 22 Dec 2017 17:13:42 -0800 + +git (1:2.15.1-2) unstable; urgency=low + + * gitweb: Recommends: 'apache2 (>= 2.4.6-4~) | lynx | httpd' instead + of ... | lynx-cur | ... (thx Łukasz Zemczak; see #490265). + * debian/control: Standards-Version: 4.1.2.0. + + -- Jonathan Nieder Mon, 18 Dec 2017 09:45:31 -0800 + +git (1:2.15.1-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.15.1.txt). + * debian/control: Build-Depends-Indep: asciidoc (>= 8.6.10). + * debian/control: Standards-Version: 4.1.1.1. + * debian/patches: + * Normalize-generated-asciidoc-timestamps-...diff: remove; no + longer needed (thx Anders Kaseorg; see #782294). + * git-gui-Sort-entries-in-optimized-tclIndex.diff: update to + upstream version. + + -- Jonathan Nieder Wed, 29 Nov 2017 13:49:38 -0800 + +git (1:2.15.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.15.0.txt). + + -- Jonathan Nieder Mon, 30 Oct 2017 10:56:56 -0700 + +git (1:2.15.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Mon, 23 Oct 2017 10:15:45 -0700 + +git (1:2.15.0~rc1-1) unstable; urgency=low + + * new upstream release candidate. + * remove transitional git-core package (thx Holger Levsen; + closes: #878189). + + -- Jonathan Nieder Mon, 16 Oct 2017 09:29:08 -0700 + +git (1:2.15.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.15.0.txt). + + -- Jonathan Nieder Mon, 09 Oct 2017 10:13:35 -0700 + +git (1:2.14.2-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.14.1.txt). Among other + changes, this fixes a remote shell command execution vulnerability + via CVS protocol: + - git-shell: drop cvsserver support by default + - git-cvsserver: harden backtick captures against user input + + Thanks to joernchen of Phenoelit for discovering, reporting, and + fixing this vulnerability, and to Junio C Hamano and Jeff King for + the fixes to related issues. + + -- Jonathan Nieder Mon, 25 Sep 2017 18:23:18 -0700 + +git (1:2.14.1-3) unstable; urgency=low + + * git.README.Debian: remove obsolete instructions about setting up a + server to handle rsync:// protocol. + + -- Jonathan Nieder Mon, 28 Aug 2017 10:08:04 -0700 + +git (1:2.14.1-2) unstable; urgency=low + + * debian/control: git-daemon-sysvinit: Priority: optional. + * debian/control: clarify how to decide between git-daemon-run and + git-daemon-sysvinit in package descriptions. + * debian/control: Standards-Version: 4.0.1.0. + + -- Jonathan Nieder Mon, 14 Aug 2017 12:14:32 -0700 + +git (1:2.14.1-1) unstable; urgency=high + + * new upstream point release to fix CVE-2017-1000117, arbitrary + code execution issues via URLs (see RelNotes/2.14.1.txt). + + -- Jonathan Nieder Thu, 10 Aug 2017 09:16:20 -0700 + +git (1:2.14.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.14.0.txt). + * debian/patches/0001-pre-rebase-hook-capture-documentation-...diff: + remove; applied upstream. + * build against PCRE v2 if available at build time (thx to Ævar + Arnfjörð Bjarmason for the suggestion). Build-Depends: + libpcre2-dev | libpcre3-dev. + + -- Jonathan Nieder Mon, 07 Aug 2017 11:31:25 -0700 + +git (1:2.13.3-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.13.3.txt). + + -- Jonathan Nieder Mon, 17 Jul 2017 12:16:44 -0700 + +git (1:2.13.2-3) unstable; urgency=low + + * remove git-arch package. It depended on GNU Arch, which has not + been maintained upstream for more than 10 years (thx Adrian + Bunk; closes: #866059). + * debian/rules: do not allow flaky git-svn tests t9128.4 or t9167.3 + to cause the build to fail, either (closes: #865789). + + -- Jonathan Nieder Fri, 30 Jun 2017 16:11:06 -0700 + +git (1:2.13.2-2) unstable; urgency=low + + * git-email: use perl in dependency instead of perl-modules (thx + Damyan Ivanov for suggesting it through lintian). + * debian/rules: do not allow flaky git-svn test t9128.3 to cause + the build to fail (closes: #865789). + + -- Jonathan Nieder Mon, 26 Jun 2017 15:17:48 -0700 + +git (1:2.13.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.13.2.txt). + * git-email: Depends: perl-modules (>> 5.21.5) | libnet-smtp-ssl-perl + for starttls support instead of unconditionally requiring + Net::SMTP::SSL (thx Dennis Kaarsemaker). + * debian/rules: skip HTML documentation generation when + DEB_BUILD_OPTIONS=nodoc. + * debian/copyright: use https form of Format URL. + * debian/control: Standards-Version: 4.0.0.0. + + -- Jonathan Nieder Mon, 26 Jun 2017 11:47:14 -0700 + +git (1:2.13.1-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.12.0.txt, RelNotes/2.13.0.txt). + * debian/patches/xdiff-Do-not-enable-XDF_FAST_HASH-by-default.diff, + shell-disallow-repo-names-beginning-with-dash.patch: remove; applied + upstream. + * update debian/copyright + * debian/rules: run tests once and always produce verbose output. + + -- Jonathan Nieder Wed, 21 Jun 2017 15:42:17 -0700 + +git (1:2.11.0-4) unstable; urgency=low + + [ Alan Jenkins ] + * git: remove Recommends: rsync (closes #862435). + * git-arch: Depends: rsync. + + -- Jonathan Nieder Mon, 15 May 2017 12:13:38 -0700 + +git (1:2.11.0-3) unstable; urgency=high + + * Do not allow git helpers run via git-shell to launch a pager + (CVE-2017-8386). + + -- Jonathan Nieder Tue, 09 May 2017 16:23:17 -0700 + +git (1:2.11.0-2) unstable; urgency=medium + + * gitweb: Depends: libcgi-pm-perl; Build-Depends: libcgi-pm-perl + (thx Mikko Rasa; closes: #847961). + + -- Jonathan Nieder Tue, 27 Dec 2016 15:17:12 -0800 + +git (1:2.11.0-1) unstable; urgency=medium + + * New upstream release (see RelNotes/2.11.0.txt). + * debian/patches/git-sh-setup-Restore-sourcability-from-outside-script.diff: + remove; applied upstream. + * Replace + debian/patches/Documentation-omit-asciidoc-footer-on-generated-input.diff + with the more upstreamable + debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff. + * debian/patches/git-gui-Sort-entries-in-optimized-tclIndex.diff, + debian/patches/xdiff-Do-not-enable-XDL_FAST_HASH-by-default.diff: + Further improvements to build reproducibility. + + -- Anders Kaseorg Wed, 30 Nov 2016 23:34:59 -0500 + +git (1:2.10.2-3) unstable; urgency=medium + + * debian/rules: Split override_dh_installdocs into -arch and -indep + parts. (Closes: #843393) + + -- Anders Kaseorg Wed, 16 Nov 2016 16:12:02 -0500 + +git (1:2.10.2-2) unstable; urgency=medium + + * Add missing upstream changelog entries from v2.10.2. + * gitweb: Add version to Breaks: apache2.2-common (<< 2.3~). + * git-mediawiki: Shorten description. + * Link extra license files to common-licenses. + * Invoke dpkg-maintscript-helper dir_to_symlink correctly. + (Closes: #843011) + * debian/patches/Documentation-omit-asciidoc-footer-on-generated-input.diff: + Omit the “last updated” footer when processing asciidoc inputs that + are generated at build time. (Closes: #813912) + + -- Anders Kaseorg Sat, 05 Nov 2016 07:20:14 -0400 + +git (1:2.10.2-1) unstable; urgency=medium + + * New upstream point release (see RelNotes/2.10.2.txt). + - imap-send: Tell cURL to use imap:// or imaps:// (Closes: #648329) + * Run asciidoc in TZ=UTC to improve the reproducibility of documentation + footer timestamps. + * debian/patches/git-sh-setup-Restore-sourcability-from-outside-script.diff: + Restore sourcability of git-sh-setup from outside scripts. + (Closes: #842477) + + -- Anders Kaseorg Sat, 29 Oct 2016 22:44:37 -0400 + +git (1:2.10.1-1) unstable; urgency=medium + + * New upstream release (see RelNotes/2.10.0.txt, RelNotes/2.10.1.txt). + (Closes: #840800) + * debian/rules: Fix clean target to remove GIT-VERSION-FILE and + contrib/subtree build products. (Closes: #834870) + * Fix a missing reference in /usr/share/doc-base/everyday-git. + (Closes: #836516) + * Migrate patches to 3.0 (quilt) format. (Closes: #834566) + * Migrate packaging to Debhelper. (Closes: #834886) + * Replace perl-modules dependency with perl. + * git-daemon-sysvinit: Depend lsb-base (>= 3.0-6) for + /lib/lsb/init-functions. + + -- Anders Kaseorg Fri, 14 Oct 2016 21:47:15 -0400 + +git (1:2.9.3-1) unstable; urgency=medium + + * New upstream release (see RelNotes/2.8.2.txt, RelNotes/2.8.3.txt, + RelNotes/2.9.0.txt, RelNotes/2.9.1.txt, RelNotes/2.9.2.txt, + RelNotes/2.9.3.txt). + + -- Anders Kaseorg Tue, 16 Aug 2016 16:32:47 -0400 + +git (1:2.8.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0003-0007-srv-be-more-tolerant-of-broken-DNS-replies.diff: + remove. + + -- Jonathan Nieder Mon, 18 Apr 2016 17:23:33 -0700 + +git (1:2.8.0~rc3-1) unstable; urgency=medium + + * new upstream release candidate (see RelNotes/2.8.0.txt). + * harden against on-stack and on-heap buffer overflows (CVE-2016-2324, + CVE-2016-2315; closes: #818318). + * debian/git.docs: update for README -> README.md renaming. + + -- Jonathan Nieder Wed, 16 Mar 2016 18:28:12 -0700 + +git (1:2.7.0-1) unstable; urgency=low + + * new upstream release. + + -- Jonathan Nieder Tue, 19 Jan 2016 11:04:08 -0800 + +git (1:2.7.0~rc3-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.7.0.txt). + * debian/control: Standards-Version: 3.9.6.0. + * debian/control: use HTTPS for Homepage URL. + + -- Jonathan Nieder Mon, 04 Jan 2016 12:25:50 -0800 + +git (1:2.6.4-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.6.4.txt). + + -- Jonathan Nieder Thu, 10 Dec 2015 16:07:19 -0800 + +git (1:2.6.3-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.6.3.txt). + + -- Jonathan Nieder Tue, 08 Dec 2015 12:02:26 -0800 + +git (1:2.6.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/2.6.2.txt). + + -- Jonathan Nieder Fri, 23 Oct 2015 11:52:44 -0700 + +git (1:2.6.1-1) unstable; urgency=high + + * new upstream point release (see RelNotes/2.6.1.txt). + + -- Jonathan Nieder Mon, 05 Oct 2015 11:16:05 -0700 + +git (1:2.6.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.6.0.txt). + + -- Jonathan Nieder Tue, 29 Sep 2015 12:55:19 -0700 + +git (1:2.5.3-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.5.2.txt, 2.5.3.txt). + + -- Jonathan Nieder Fri, 18 Sep 2015 12:36:49 -0700 + +git (1:2.5.1-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.5.1.txt). + + -- Jonathan Nieder Fri, 28 Aug 2015 14:27:25 -0700 + +git (1:2.5.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.5.0.txt). + + -- Jonathan Nieder Tue, 28 Jul 2015 10:47:13 -0700 + +git (1:2.4.6-1) unstable; urgency=medium + + * new upstream release (see RelNotes/2.[234].*.txt). + * debian/rules: use install-html target for git-subtree docs + (see #768795). + * gitweb: Pre-Depends: dpkg 1.16.1 for -noawait support. + * gitweb.apache2.conf: make configuration conditional on MIME + support (thx Uwe Storbeck; closes: #775236). + + -- Jonathan Nieder Tue, 21 Jul 2015 12:08:09 -0700 + +git (1:2.1.4-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use interest-noawait triggers for gitweb to avoid a + trigger cycle. (Closes: #774607) + + -- Niels Thykier Mon, 02 Feb 2015 19:42:37 +0100 + +git (1:2.1.4-2) unstable; urgency=medium + + * update gitweb configuration for Apache 2.4: + * apache2.conf: + * make configuration conditional on CGI and alias support. + * put explicit '+' before FollowSymLinks option. + * README.Debian: update with new configuration file path. + Mention CGI support requirement. + * prerm: fix typo in last line (it should be "fi", not "then"). + * update version number in conffile handling code to handle + upgrades within testing. + + -- Jonathan Nieder Fri, 19 Dec 2014 17:52:50 -0800 + +git (1:2.1.4-1) unstable; urgency=medium + + * new upstream point release (CVE-2014-9390). + * checkout: tighten exit code handling on errors. + * avoid writing filenames to the work tree that some filesystems + do not distinguish from ".git". + * reject ".gIt" and other path components that case-fold + to ".git" in "git checkout", "git add", and "git fsck". + * new '[core] protectHFS' setting to reject path components + such as ".Git\u200f" that HFS+ folds to ".git" in + "git checkout" and "git add". Always reject such paths + in "git fsck". (U+200F is the Unicode right-to-left + mark.) + * new '[core] protectNTFS' setting to reject path components + such as ".Git " that NTFS folds to ".git" in "git checkout" + and "git add". Always reject such paths in "git fsck". + * gitweb: use apache 2.4-compatible configuration (thx Jean-Michel + Nirgal Vourgère for advice; closes: #669292). + * rules, conffiles: Apache configuration goes in + /etc/apache2/conf-available, not conf.d. + * preinst, postinst, postrm: use dpkg-maintscript-helper to + rename the conffile and preserve local changes. + * postinst, prerm, postrm: use apache2-maintscript-helper if + present to load and unload gitweb configuration. + * implicit: check for debian/$pkg.triggers. + * triggers: re-run postinst when apache2-maintscript-helper is + installed. + * control: + * Pre-Depends: dpkg 1.15.8 for dpkg-maintscript-helper. + * Breaks: apache2.2-common because the Apache configuration + requires version 2.4. + * debian/diff/0009-git-svn-use-SVN-Ra-get_dir2-when-possible.diff: + new from upstream: git svn: use get_dir2 instead of get_dir when + possible (thx Eric Wong; works around: #767530). + * debian/diff/0010-gitweb-hack-around-CGI-s-list-context-...diff: + new from upstream: gitweb: be explicit about use of param() in list + context, avoiding log noiose with libcgi-pm-perl >= 4.08 and a test + failure in t9500-gitweb-standalone-no-errors.sh (thx Reiner + Herrmann; closes: #770655). + * correct spelling of Roland Mas's name in the 1:2.1.3-1 changelog + entry. + + -- Jonathan Nieder Fri, 19 Dec 2014 15:55:34 -0800 + +git (1:2.1.3-1) unstable; urgency=low + + * new upstream point release. + * config --add: avoid segfault when key already has an empty value. + * remote-http: avoid failure due to command line length limits when + pushing many refs. + * fast-import: avoid segfault when trying to clear root tree. + * index-pack: reliably detect and error out when encountering + duplicate delta base. + * gc: do not prune objects only reachable from HEAD . + * fsck: be more consistent about exiting nonzero for corruption. + * am: tighten check for mbox 'From ' line. + * daemon: fix error message when bind() fails. + * mergetool: fix --output handling in meld >= 3.12 (see GNOME + bug 737869). + * gitweb: use start_form instead of startform for compatibility + with CGI.pm 4.04 and newer (thx Roland Mas; closes: #765525). + * pack-objects: do not write invalid bitmaps when hitting pack + size limit. + + -- Jonathan Nieder Tue, 04 Nov 2014 13:20:39 -0800 + +git (1:2.1.1-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Mon, 22 Sep 2014 17:56:49 -0700 + +git (1:2.1.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.1.0.txt). + + -- Jonathan Nieder Fri, 15 Aug 2014 16:09:26 -0700 + +git (1:2.1.0~rc1-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Tue, 05 Aug 2014 13:59:00 -0700 + +git (1:2.0.1-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Wed, 25 Jun 2014 15:09:25 -0700 + +git (1:2.0.0-2) unstable; urgency=low + + * debian/rules: drop obsolete THREADED_DELTA_SEARCH setting. + * debian/rules: add SANE_TOOL_PATH= INSTALL=install TAR=tar to + OPTS to fix the Dyson build (thx Игорь Пашев; closes: + #734097). + * debian/rules: remove NO_PYTHON=1 now that the git_remote_helpers + library has been removed. + * debian/rules: remove git-p4 and its documentation from the git, + git-man, and git-doc packages. It depends on Perforce, which is + not part of Debian. + + -- Jonathan Nieder Tue, 17 Jun 2014 16:17:46 -0700 + +git (1:2.0.0-1) unstable; urgency=low + + * new upstream release (see RelNotes/2.0.0.txt). + + -- Jonathan Nieder Wed, 28 May 2014 16:06:41 -0700 + +git (1:2.0.0~rc4-1) unstable; urgency=low + + * new upstream release candidate. + * remove source-highlight build dependency since the markup + requiring it was removed upstream (thx Anders Kaserog; + LP: #1316810). + * remove git-bzr package to make room for a package built from + https://github.com/felipec/git-remote-bzr. + * debian/control: remove references to git-bzr package. + * debian/control: remove Build-Depends: bzr, python-bzrlib. + * debian/rules: remove rules to build, install, and clean + git-remote-bzr. + * debian/git-doc.docs: do not install git-remote-bzr.html. + * debian/git-remote-bzr.txt, debian/git-bzr.postinst, + debian/git-bzr.prerm, debian/git-bzr.README.Debian: remove. + + -- Jonathan Nieder Wed, 21 May 2014 11:34:56 -0700 + +git (1:2.0.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Mon, 05 May 2014 17:25:50 -0700 + +git (1:2.0.0~rc0-2) unstable; urgency=low + + [ Anders Kaseorg ] + * add source-highlight build dependency (closes: #745591). + + -- Jonathan Nieder Wed, 23 Apr 2014 11:09:25 -0700 + +git (1:2.0.0~rc0-1) unstable; urgency=low + + * new upstream release candidate. + * debian/diff/0009-contrib-subtree-unset-prefix-before-....diff: + remove; applied upstream. + * update debian/copyright. + + -- Jonathan Nieder Fri, 18 Apr 2014 17:01:04 -0700 + +git (1:1.9.2-1) unstable; urgency=low + + * new upstream point release. + * wt-status: subject full label string to l10n (thx Raphaël + Hertzog; closes: #725777). + + -- Jonathan Nieder Wed, 09 Apr 2014 15:15:18 -0700 + +git (1:1.9.1-1) unstable; urgency=low + + * new upstream point release. + + [ Jonathan Nieder ] + * git-email: Recommends: libio-socket-ssl-perl (>= 1.951) since + earlier versions do not use OpenSSL's defaults when ca_path + and ca_file are unset. + + [ Gilles Filippini ] + * install git-subtree from contrib (closes: #704652). + * debian/diff/0009-contrib-subtree-unset-prefix-before-proceeding.diff: + new; unset the 'prefix' environment variable before proceeding. + + -- Jonathan Nieder Tue, 18 Mar 2014 15:58:46 -0700 + +git (1:1.9.0-1) unstable; urgency=low + + * new upstream release. + + -- Jonathan Nieder Tue, 18 Feb 2014 08:31:49 -0800 + +git (1:1.9.0~rc3-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Fri, 07 Feb 2014 15:53:52 -0800 + +git (1:1.9~rc1-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Mon, 27 Jan 2014 14:07:56 -0800 + +git (1:1.9~rc0-1) unstable; urgency=low + + * new upstream release candidate. + * debian/diff: + * 0001-remove-interpreter-line-from-shell-libraries.diff: + remove; applied upstream. + * 0002...0009: rename to 0001-*, ..., 0008-*. + * 0010-git-remote-mediawiki-do-not-remove-installed-...diff: + remove; applied upstream. + * debian/rules install: no more need to include DESTDIR in + mw-to-git INSTLIBDIR. + + -- Jonathan Nieder Mon, 27 Jan 2014 13:05:17 -0800 + +git (1:1.8.5.3-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Thu, 16 Jan 2014 16:18:25 -0800 + +git (1:1.8.5.2-2) unstable; urgency=low + + * /etc/bash_completion.d/git-prompt: check for git-sh-prompt + and do not source it if git is removed but not purged (thx + Craig Small; closes: #726669). + * debian/control: package git Breaks: git-buildpackage versions + that rely on output from 'git status' without the --porcelain + flag (closes: #734223). + + -- Jonathan Nieder Thu, 09 Jan 2014 14:46:23 -0800 + +git (1:1.8.5.2-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Tue, 17 Dec 2013 16:31:01 -0800 + +git (1:1.8.5.1-1) unstable; urgency=medium + + * new upstream point release. + * submodule: do not copy unknown update mode from .gitmodules. + + -- Jonathan Nieder Tue, 03 Dec 2013 14:12:55 -0800 + +git (1:1.8.5-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + * git-daemon-sysvinit: advertise GIT_DAEMON_BASE_PATH in + /etc/default/git-daemon (thx Alexander Dahl and Antonio + Ospite; closes: #704985). + + -- Jonathan Nieder Sat, 30 Nov 2013 11:28:02 -0800 + +git (1:1.8.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + [ Anders Kaseorg ] + * debian/rules: pass $(OPTS) to contrib/mw-to-git/Makefile + (closes: #729763). + + -- Jonathan Nieder Thu, 21 Nov 2013 16:35:29 -0800 + +git (1:1.8.5~rc2-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + [ Thorsten Glaser ] + * package mw-to-git (closes: #718395). + * debian/control: new package git-mediawiki; Depends: + libmediawiki-api-perl (>= 0.39), liblwp-protocol-https-perl, + libdatetime-format-iso8601-perl; package git now Suggests + and git-all Depends: git-mediawiki. + * debian/rules: build and install Git::Mediawiki perl module, + mediawiki remote helper, and 'git mw' command in + git-mediawiki package. + * debian/diff/0010-git-remote-mediawiki-do-not-remove-...diff: + new from upstream: mw-to-git: do not remove installed files + in "clean" target. + * debian/git-mediawiki.docs: install git-remote-mediawiki.txt. + + [ Anders Kaseorg ] + * debian/diff/0003-transport-expose-git_tcp_connect-...diff: + include tcp.h before using tcp functions (closes: #728508). + + [ Jonathan Nieder ] + * debian/diff/0012-cvsserver-Determinize-output-to-...diff: + remove; applied upstream. + + -- Jonathan Nieder Wed, 13 Nov 2013 16:12:29 -0800 + + +git (1:1.8.4.4-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Thu, 21 Nov 2013 17:51:36 -0800 + +git (1:1.8.4.3-1) unstable; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Mon, 11 Nov 2013 15:51:10 -0800 + +git (1:1.8.5~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff: + * 0001-hooks-post-receive-email-set-encoding-to-utf-8.diff, + 0002-post-receive-email-defend-against-non-utf8-...diff: + remove; applied upstream. + * 0003...0012: rename to 0001-*, ..., 0010-*. + + -- Jonathan Nieder Wed, 30 Oct 2013 16:01:15 -0700 + +git (1:1.8.4.2-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0012-cvsserver-Determinize-output-to-...diff: + new from upstream: sort cvsserver output to combat Perl 5.18 + hash randomization (thx Anders Kaseorg; closes: #727226). + + -- Jonathan Nieder Wed, 30 Oct 2013 16:00:07 -0700 + +git (1:1.8.4.1-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream point release. + * debian/control: Build-Depends tcl instead of tcl8.5 + (closes: #725961). + + -- Jonathan Nieder Mon, 21 Oct 2013 11:46:45 -0700 + +git (1:1.8.4-1) experimental; urgency=low + + * new upstream release. + + -- Jonathan Nieder Sat, 24 Aug 2013 14:50:38 -0700 + +git (1:1.8.4~rc4-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0012-*, 0013-*: remove; applied upstream. + * debian/rules: define .NOTPARALLEL to avoid races between + "make" child processes (thx Anders Kaseorg; closes: #720274). + + -- Jonathan Nieder Mon, 19 Aug 2013 22:41:08 -0700 + +git (1:1.8.4~rc3-1) unstable; urgency=low + + * new upstream release candidate. + * switch de translation from pure German to German+English. + * debian/diff/: + * 0012-Revert-git-stash-avoid-data-loss-when-....diff: new + from upstream: stash: omit too-slow check for files + replaced by directories before stashing. + * 0013-Revert-Add-new-shortcut-for-HEAD.diff: new from + upstream: treat "@" and names like "refs/heads/@/foo" as + ordinary refnames again. + * debian/control: Vcs-Git: https://repo.or.cz/r/git/debian.git/ + (thx brian m. carlson; closes: #719932). + * debian/git.README.source: suggest developing against + https://repo.or.cz/r/git/debian.git/. + * debian/watch: use xz-compressed tars from kernel.org again. + + -- Jonathan Nieder Sun, 18 Aug 2013 03:41:49 -0700 + +git (1:1.8.4~rc2-1) unstable; urgency=low + + * new upstream release candidate. + * cat-file: do not split --batch input lines on whitespace + (thx Joey Hess; closes: #718517). + + -- Jonathan Nieder Sat, 10 Aug 2013 12:25:45 -0700 + +git (1:1.8.4~rc1-1) unstable; urgency=low + + * new upstream release candidate. + * debian/watch: point to code.google.com again. + * debian/git.preinst: + * check that targets in /var/cache/git/* exist when + creating symlinks from /var/lib/git/ (thx Steve Cotton and + Christoph Anton Mitterer; closes: #718411). + * remove spurious '/var/lib/git/*' symlink from the upgrade + to 1:1.8.4~rc0-1. + + -- Jonathan Nieder Thu, 01 Aug 2013 23:14:58 -0700 + +git (1:1.8.4~rc0-1) unstable; urgency=low + + * new upstream release candidate. + * use /var/lib/git instead of /var/cache/git as default git + project root to comply with the Filesystem Hierarchy Standard + (thx Julian Gilbey; closes: #483788): + * git-daemon.default, git-daemon.in, git-daemon/run: use + base path of /var/lib and projectroot of /var/lib/git. + * gitweb.conf: $projectroot = "/var/lib/git". + * rules: package git: install empty /var/lib/git directory + instead of /var/cache/git. + * git.README.Debian, git-daemon-run.README.Debian, + git-daemon-sysvinit.README.Debian, gitweb.README.Debian: + update for the new project root. + * git.preinst: install symlinks /var/lib/git/* -> + ../../cache/git/*. + * git.NEWS.Debian: advertise the change and explain how to + adapt to it. + * update debian/copyright. + + -- Jonathan Nieder Tue, 30 Jul 2013 19:11:14 -0700 + +git (1:1.8.3.2-1) unstable; urgency=low + + * new upstream point release (see RelNotes/1.8.3.2.txt). + + -- Jonathan Nieder Mon, 01 Jul 2013 19:20:03 -0700 + +git (1:1.8.3.1-1) unstable; urgency=low + + * merge branch debian-experimental + * new upstream point release (see RelNotes/1.8.3.1.txt). + * debian/watch: use xz-compressed tarballs from kernel.org. + + -- Jonathan Nieder Wed, 12 Jun 2013 07:50:53 -0700 + +git (1:1.8.3-1) experimental; urgency=low + + * new upstream release (see RelNotes/1.8.3.txt). + + -- Jonathan Nieder Wed, 29 May 2013 22:32:40 -0700 + +git (1:1.8.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Sun, 19 May 2013 11:49:16 -0700 + +git (1:1.8.3~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * gitk: "grep diff" pickaxe variant (closes: #589283). + * debian/rules: install perl modules with correct permissions + (thx Christian Schwartz for suggesting it through lintian). + * move "git svn" perl helpers to the git-svn package. + * debian/rules: install Git::SVN and Git::SVN::* to the + git-svn package, not git. + * debian/control: git-svn: Breaks: and Replaces: old git. + * debian/rules: install perl module manpages to git-man and + git-svn packages, as appropriate. + * debian/rules: mark hooks in /usr/share/git-core/contrib/hooks/ + as executable (thx Olivier Berger; closes: #687391). + * debian/control: drop Depends: and Build-Depends: libc6.1 + (>= 2.10.2-6) [ia64] workaround for #563882, since that bug did + not affect any stable release. + * debian/control: drop dependencies on pre-Debian 5.0 (lenny) + packages. + * do not accept libcurl3-gnutls-dev as a substitute for + libcurl4-gnutls-dev. + * do not accept libsvn-core-perl as a substitute for + libsvn-perl. + * make asciidoc, docbook-xsl, runit, and tk dependencies + unversioned. + * git, git-man, git-cvs, git-svn, git-email, gitk: drop Breaks + and Replaces against cogito (<< 0.16rc2-0). + * git: drop Breaks against old qgit and git-buildpackage. + * git: drop Conflicts against git-core (<< 1:1.5.2~rc3-2.). + * git-gui: no longer Replaces git-core (<< 1:1.5.2.2-3). + * Use source format 3.0 (quilt). + + -- Jonathan Nieder Wed, 15 May 2013 00:20:06 -0700 + +git (1:1.8.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * log --pretty: avoid undefined behavior in %>, %<, %><'s + truncation support (closes: #706400). + + -- Jonathan Nieder Fri, 03 May 2013 23:28:04 -0700 + +git (1:1.8.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * remote-bzr: respect bzr "author" field in import (closes: + #705245). + * remote-bzr: allow re-add of a deleted file in the same commit + (closes: #704913, #704959). + + -- Jonathan Nieder Mon, 29 Apr 2013 00:29:14 -0700 + +git (1:1.8.2.1-1) experimental; urgency=low + + * new upstream point release (see RelNotes/1.8.2.1.txt). + * debian/implicit: + * check for debian/changelog.upstream. + * %.deb-DEBIAN-md5sums depends on /usr/share/doc/$pkg/doc/, + doc-base/, and lintian/ directories. + * do not remove files named after implicit targets. + * debian/rules: + * respect in DEB_BUILD_OPTIONS=parallel=. + * do not create ./changelog symlink (avoiding a race). + * override implicit git-core.deb-docs target, since git-core does + not have its own doc/ directory. + * debian/README.source: point to git.README.source (thx Helmut + Grohne; closes: #704580) + * debian/git.NEWS.Debian: add leading spaces before tab for + changelog parsers (thx Russ Allbery for suggesting it through + lintian). + + -- Jonathan Nieder Mon, 08 Apr 2013 00:46:02 -0700 + +git (1:1.8.2-1) experimental; urgency=low + + * new upstream release (see RelNotes/1.8.2.txt). + * package the bzr remote helper (closes: #702697). + * debian/control: new package git-bzr; Priority: extra; Provides: + git-remote-bzr; Depends: python, python-bzrlib; Conflicts: + bzr-git; Build-Depends: bzr, python, python-bzrlib for tests; + package git now Suggests and git-all Recommends: git-bzr. + * debian/git-remote-bzr.txt: new; explain usage. + * debian/rules: build git-remote-bzr documentation, munge script + shebang line, and install manpage (git-remote-bzr--git.1.gz) + and script (/usr/lib/git-core/git-remote-bzr--git) in git-bzr + package. + * debian/git-doc.docs: install git-remote-bzr.html. + * debian/git-bzr.postinst, debian/git-bzr.prerm: new; provide + /usr/bin/git-remote-bzr through the alternatives system. + * debian/git-bzr.README.Debian: new; explain how to get started. + * debian/control: Standards-Version: 3.9.4.0. + * debian/rules: define %.install depending on install-arch or + install-indep as appropriate for each package. + * debian/implicit: depend on %.install instead of both install-arch + and install-indep so "debian/rules binary-arch" does not try to + build documentation. + * debian/rules build-indep, install-indep: build documentation even + if asciidoc is not installed. Build-Depends: dpkg-dev (>= 1.16.2). + * debian/rules: handle DEB_BUILD_OPTIONS=parallel=. + + -- Jonathan Nieder Sun, 31 Mar 2013 22:06:58 -0700 + +git (1:1.8.2~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Sat, 09 Mar 2013 00:50:39 -0800 + +git (1:1.8.2~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * skip readlink() of entries in GIT_CEILING_DIRECTORIES after an + empty entry (thx Anders Kaseorg and Michael Haggerty). + * update debian/copyright. + + -- Jonathan Nieder Sun, 03 Mar 2013 15:22:27 -0800 + +git (1:1.8.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Sat, 02 Mar 2013 13:27:28 -0800 + +git (1:1.8.2~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * push: require force for refs under refs/tags/. + * push: require force for annotated tags. + * debian/git.NEWS.Debian: advertise upcoming change to default + behavior of argumentless "git push []". + * git-svn: no longer Depends: libwww-perl (thx RjY; closes: + #699536). + * update debian/copyright (closes: #699930). + + -- Jonathan Nieder Mon, 18 Feb 2013 16:52:57 -0800 + +git (1:1.8.1.3-1) experimental; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Thu, 07 Feb 2013 23:08:48 -0800 + +git (1:1.8.1.2-1) experimental; urgency=low + + * new upstream point release. + + -- Jonathan Nieder Sun, 03 Feb 2013 23:01:24 -0800 + +git (1:1.8.1.1-1) experimental; urgency=low + + [ Jonathan Nieder ] + * debian/git.NEWS.Debian: bash completion script moved to + /usr/share/bash-completion/completions/ (thx Philipp Marek; + closes: #698055). + + [ Gerrit Pape ] + * new upstream release. + + -- Gerrit Pape Wed, 16 Jan 2013 08:17:53 +0000 + +git (1:1.8.1-1) experimental; urgency=low + + * new upstream release (see RelNotes/1.8.1.txt). + + -- Jonathan Nieder Mon, 31 Dec 2012 18:40:24 -0800 + +git (1:1.8.1~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * grep: enable perl regex (-P) support (thx Guido Günther; closes: + #669376). + + -- Jonathan Nieder Tue, 25 Dec 2012 23:40:08 -0800 + +git (1:1.8.1~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/control: mark all binary packages Multi-Arch: foreign (thx + Colin Watson; closes: #694651). + + -- Jonathan Nieder Thu, 06 Dec 2012 15:10:21 -0800 + +git (1:1.8.0-1) experimental; urgency=low + + * new upstream release (see RelNotes/1.7.11.txt, RelNotes/1.7.12.txt, + RelNotes/1.8.0.txt) + * git-svn: ignore SIGPIPE so serf can recover from HTTP timeouts + (closes: #526989). + * git-svn: use platform specific auth providers. + * git-svn: handle errors and concurrent commits in dcommit + (closes: #676904). + * am: support --include option. + * grep: add a grep.patternType configuration setting. + * daemon: --access-hook for authentication logging and policy. + * merge-base: expose --is-ancestor helper for scripts. + * branch: support --set-upstream-to with simpler syntax than + --set-upstream. + * format-patch: do not use bogus email addresses in message ids. + * http: trim trailing newline from /etc/mailname. + * do not ignore port in ssh URLs with ipv6 literals + (closes: #646178). + * look in ~/.config/git/config (XDG_CONFIG_HOME can override this) + before ~/.gitconfig for configuration. + * [core] excludesfile and attributes file default to + ~/.config/git/ignore and ~/.config/git/attributes. + * var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR + settings (closes: #666250). + * git-blame.el: address elisp warnings from emacs: + * use mapc instead of mapchar (closes: #611931). + * do not use goto-line in lisp code (closes: #611933). + * use with-current-buffer where appropriate (closes: #611932). + * cli: add Italian and Vietnamese translations. + * push: introduce new push.default mode "simple". It will be the + default in the next major release. + + [ Jonathan Nieder ] + * debian/diff: + * 0013...0031: remove; applied upstream. + * 0012-Makefile-add-a-knob-to-turn-off-...diff: remove; fixed + upstream. + * debian/rules: + * install German translation. + * use NO_INSTALL_HARDLINKS=1 instead of NO_HARDLINKS=1 in OPTS + (thx Tomáš Myšík and Anders Kaseorg; see #683568). + * install-arch: sanity-check that built-ins still do not approach + btrfs hardlink limit (see #642603). + * git: install git-prompt.sh from contrib/completion to + /usr/lib/git-core/git-sh-prompt. + * git: install completion script to + /usr/share/bash-completion/completions/{git,gitk} instead of + /etc/bash_completion.d. This allows bash-completion 2.0 to load + it on the fly when completing arguments to git commands. + * debian/control: Breaks: bash-completion (<< 1:1.90-1). + * debian/git.preinst, debian/git.postinst, debian/git.postrm: + remove /etc/bash_completion.d/git on upgrade if unmodified. + * debian/rules, debian/git.conffiles, debian/git-prompt.completion: + /etc/bash_completion.d/git-prompt: new; source + /usr/lib/git-core/git-sh-prompt so .bashrc files that rely on the + completion lib defining __git_ps1 can continue to work (thx Danny + Yates and Anders Kaseorg). + * debian/git.conffiles: remove /etc/bash_completion.d/git. + * update debian/copyright. + * debian/control: gitweb: Recommends: libhttp-date-perl or + libtime-module-perl for If-Modified-Since support; Build-Depends: + same to support test suite. + * debian/implicit: use order-only dependencies so "debian/rules + binary-arch" does not try to build documentation. + + [ Gerrit Pape ] + * new upstream release. + + -- Jonathan Nieder Wed, 31 Oct 2012 17:58:10 -0700 + +git (1:1.7.10.4-2) unstable; urgency=low + + * debian/diff: + * 0013...0030: new from the upstream 'master' branch: git svn: + adapt to svn 1.7 changes: + * normalize paths and URLs passed to Subversion (thx Michael G. + Schwern; closes: #678137) + * use correct "svn cp" syntax when checking git svn's mangling + of @-signs in branch names (svn became stricter). + * commit filetype changes between a regular file and symlink as + replacement (deletion followed by addition) instead of + modification of files. Otherwise, clients pulling the change + with "svn update" hit an assertion failure (svn issue 4091). + * 0031-git-svn-use-YAML-format-...diff: new from 1.7.11: git svn: + use YAML format for mergeinfo cache when possible. + * debian/control: git-svn: Depends: libyaml-perl for platform- and + version-independent .git/svn/.caches format; Build-Depends: + libyaml-perl for tests (thx Tim Retout for the analysis; closes: + #587650). + + -- Jonathan Nieder Fri, 12 Oct 2012 13:27:36 -0700 + +git (1:1.7.10.4-1) unstable; urgency=low + + * new upstream point release (thx Jonathan Nieder). + + -- Gerrit Pape Fri, 08 Jun 2012 00:04:11 +0000 + +git (1:1.7.10.2-1) unstable; urgency=low + + * new upstream point release. + * merge-recursive: don't detect renames of empty files. + * fast-import: tighten parsing of datarefs. + * diff -c -U0: fix segfault showing start of file. + * debian/rules: do not install preliminary German translation. + + -- Jonathan Nieder Fri, 11 May 2012 20:20:15 -0500 + +git (1:1.7.10-1) unstable; urgency=low + + * new upstream release. + * merge: use editor by default in interactive sessions + * submodules: use relative paths to git dir and worktree. + * fast-import: reject "ls" of path with empty components. + * cli: add Chinese, Dutch, Portuguese, and Swedish translations. + * am: officially deprecate -b/--binary option. + * debian/diff: + * 0005-gitk-use-symbolic-font-names-sans-and-monospace-when-.diff, + 0006-gitk-Skip-over-AUTHOR-COMMIT_DATE-when-searching-all-.diff: + remove; applied upstream. + * 0007...0014: rename to 0005-*, ... 0012-*. + * debian/git.README.Debian: make paths in inetd(8) hint + consistent with git-daemon-run and git-daemon-sysvinit setup. + * debian/control: package git: Suggests: gettext-base for translated + output in shell scripts. + + -- Jonathan Nieder Fri, 06 Apr 2012 22:28:18 -0500 + +git (1:1.7.9.5-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-daemon-sysvinit: Priority: extra (thx Jonathan + Nieder; closes: #661317). + + -- Gerrit Pape Wed, 28 Mar 2012 12:30:35 +0000 + +git (1:1.7.9.4-1) unstable; urgency=low + + * new upstream point release. + * commit: skip intent-to-add entries instead of erroring out. + * grep -I: let diff attribute override binary file detection. + * clone, daemon, http-backend, transport: look for .../foo before + .../foo.git in response to requests for .../foo. + * rev-list: enable or disable --verify-objects behavior based on + the command line instead of uninitialized memory. + * checkout -b: allow switching out of an unborn branch (closes: + #506480). + * debian/diff: clean up patches for upstream. + * 0001-hooks-post-receive-email-set-encoding-to-utf-8.diff: + hooks/post-receive-email: set content-transfer-encoding as well. + * 0002-post-receive-email-defend-against-non-utf8-...diff: new; + hooks/post-receive-email: avoid mixed-encoding messages when + i18n.logoutputencoding is not utf8 (thx Alexey Shumkin). + * 0002-remove-shebang-...diff: rename to 0003-remove-...diff; + remove #! line from sh-i18n and rebase--* shell libraries, too + (lintian); fix tests' --valgrind support to detect shell + libraries without the #! line (thx Jeff King). + * 0003-pre-rebase-hook-capture-...diff: simplify (thx Junio C + Hamano); rename to 0004-*. + * 0004-gitk-use-symbolic-font-names-...diff: rename to 0005-*; use + non-symbolic font names on platforms like Mac OS X, Windows, and + tk <= 8.4 that lack fontconfig support. + * 0005...0008, 0010: rename to 0006-*, ..., 0009-*, 0011-*; + clarify descriptions. + * 0009-tcp-unify-ipv4-and-ipv6-code-paths.diff, 0011-*: combine; + rename to 0010-*. + * 0012-transport-optionally-honor-DNS-SRV-records.diff, 0013-*: + combine; rename to 0011-*. + * 0014, 0015: rename to 0013-*, 0014-*. + * debian/git-daemon.init: respect GIT_DAEMON_ENABLE in restart and + reload actions (thx Jonathan McCrohan; closes: #663522). + * debian/control: git-gui: point to aspell for spell checking support + in the package description; Suggests: aspell (thx Jonathan Ballet, + closes: #656061). + * debian/control: add Vcs-Browser: http://repo.or.cz/w/git/debian.git + (thx Jonathan McCrohan; closes: #663451). + * debian/control: Standards-Version: 3.9.3.1. + * debian/copyright: adopt copyright-format 1.0. + + -- Jonathan Nieder Wed, 14 Mar 2012 02:40:00 -0500 + +git (1:1.7.9.1-1) unstable; urgency=low + + * new upstream point release. + * merge: do not launch an editor on "--no-edit $tag" (thx Guido + Günther; closes: #659255). + + -- Jonathan Nieder Tue, 14 Feb 2012 15:32:48 -0600 + +git (1:1.7.9-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release (closes: #657262). + * debian/diff/0016-unix-socket-handle-long-socket-...diff: remove; + applied upstream. + * debian/changelog: add missing parenthesis to 1:1.7.9~rc1-1 entry. + + -- Jonathan Nieder Fri, 27 Jan 2012 21:23:27 -0600 + +git (1:1.7.9~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff: + * 0014-Makefile-add-a-knob-to-...diff: rename to 0015-*. + * 0014-srv-be-more-tolerant-of-broken-DNS-replies.diff: new; srv: + convert some error conditions to warnings (closes: #649781). + * 0016-unix-socket-handle-long-socket-pathnames.diff: new from + upstream; credential-cache: handle long socket pathnames (closes: + #655288). + + -- Jonathan Nieder Fri, 13 Jan 2012 16:10:44 -0600 + +git (1:1.7.9~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * update debian/copyright. + + -- Jonathan Nieder Fri, 06 Jan 2012 17:06:55 -0600 + +git (1:1.7.8.3-1) unstable; urgency=medium + + * new upstream point release. + * debian/git.preinst: on upgrade from git <= 1:1.7.7-1, replace + /usr/lib/git-core/git with a copy of itself. This prevents "are the + same file" errors when replacing hard links to the old copy with + symlinks using "mv" (thx Jon Dowland and Anders Kaseorg; closes: + #654596). + + -- Jonathan Nieder Fri, 06 Jan 2012 16:45:46 -0600 + +git (1:1.7.8.2-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + + -- Jonathan Nieder Thu, 29 Dec 2011 01:30:43 -0600 + +git (1:1.7.8~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Fri, 18 Nov 2011 04:09:51 -0600 + +git (1:1.7.8~rc2-1) experimental; urgency=low + + [ Jonathan Nieder ] + * new upstream release candidate. + * merge branch debian-sid. + * update debian/copyright. + * debian/git.preinst: replace hard links to /usr/lib/git-core/git with + symlinks before upgrading from git <= 1:1.7.7-1 (thx Antti Kultanen; + closes: #645009). + + [ Gerrit Pape ] + * merge branch debian-sid. + + -- Gerrit Pape Wed, 16 Nov 2011 09:55:47 +0000 + +git (1:1.7.7.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 14 Nov 2011 10:22:34 +0000 + +git (1:1.7.7.2-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: add separate build-arch and build-indep targets + (thx Roger Leigh for suggesting it through lintian). + * debian/rules: drop CFLAGS=-O0 workaround for ancient hppa code + generation bug (see #426302). + * debian/rules: use dpkg-buildflags to retrieve compiler flags + (including hardening options). Build-Depends: dpkg-dev (>= 1.15.7). + + -- Jonathan Nieder Tue, 01 Nov 2011 23:41:55 -0500 + +git (1:1.7.8~rc0-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/diff/0001-...diff, 0002-...diff, 0003-...diff: remove; + applied upstream (thx Jonathan Nieder). + + -- Gerrit Pape Mon, 31 Oct 2011 09:45:53 +0000 + +git (1:1.7.7.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0003-Makefile-do-not-set-setgid-bit-on-dir...diff: + remove; applied upstream. + + -- Gerrit Pape Mon, 24 Oct 2011 20:27:20 +0000 + +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 diff --git a/debian/changelog.upstream b/debian/changelog.upstream new file mode 100644 index 0000000..568d61c --- /dev/null +++ b/debian/changelog.upstream @@ -0,0 +1,85837 @@ +Version v2.47.1; changes since v2.47.0: +--------------------------------------- + +Andrew Kreimer (6): + compat: fix typos + contrib: fix typos + t/unit-tests: fix typos + t/perf: fix typos + t/helper: fix a typo + t: fix typos + +Daniel Black (1): + submodule: correct remote name with fetch + +Derrick Stolee (1): + line-log: protect inner strbuf from free + +Jeff King (7): + line-log: use diff_line_prefix() instead of custom helper + diff: drop line_prefix_length field + diff: return const char from output_prefix callback + diff: return line_prefix directly when possible + diff: store graph prefix buf in git_graph struct + simple-ipc: split async server initialization and running + fsmonitor: initialize fs event listener before accepting clients + +Johannes Schindelin (1): + docs: fix the `maintain-git` links in `technical/platform-support` + +Josh Heinrichs (1): + git-config.1: remove value from positional args in unset usage + +Josh Soref (2): + doc: update links to current pages + doc: switch links to https + +Junio C Hamano (3): + doc: clarify in refspec syntax + Prepare for 2.47.1 + Git 2.47.1 + +Karthik Nayak (1): + loose: don't rely on repository global state + +Kristoffer Haugsbakk (2): + doc: merge-tree: improve example script + checkout: refer to other-worktree branch, not ref + +Patrick Steinhardt (4): + cache-tree: refactor verification to return error codes + cache-tree: detect mismatching number of index entries + unpack-trees: detect mismatching number of cache-tree/index entries + builtin/gc: fix crash when running `git maintenance start` + +Shubham Kanodia (1): + doc: add a note about staggering of maintenance + +Taylor Blau (2): + Documentation: mention the amlog in howto/maintain-git.txt + Makefile(s): avoid recipe prefix in conditional statements + +Toon Claes (1): + bundle-uri: plug leak in unbundle_from_file() + +Xing Xin (1): + Documentation/gitprotocol-v2.txt: fix a slight inconsistency in format + + +Version v2.47.0; changes since v2.47.0-rc1: +------------------------------------------- + +Alexander Shopov (1): + l10n: bg.po: Updated Bulgarian translation (5772t) + +Andrew Kreimer (6): + Documentation/config: fix typos + Documentation: fix typos + trace2: fix typos + reftable: fix a typo + mergetool: fix a typo + perl: fix a typo + +Bagas Sanjaya (1): + l10n: po-id for 2.47 + +Derrick Stolee (1): + read-cache: free threaded memory pool + +Emir SARI (1): + l10n: tr: Update Turkish translations for 2.47.0 + +Jean-Noël Avila (1): + l10n: fr.po: 2.47.0 + +Jeff King (4): + test-lib: stop showing old leak logs + test-lib: show leak-sanitizer logs on --immediate failure + test-lib: check for leak logs after every test + hash.h: set NEEDS_CLONE_HELPER_UNSAFE in fallback mode + +Jordi Mas (2): + l10n: Update Catalan translation + l10n: new lead for Catalan translation + +Junio C Hamano (4): + howto-maintain-git: discarding inactive topics + A bit more after 2.47-rc1 + Mostly there for 2.47 final + Git 2.47 + +Koji Nakamaru (1): + fsmonitor OSX: fix hangs for submodules + +Mike Hommey (1): + utf8.h: squelch unused-parameter warnings with NO_ICONV + +Patrick Steinhardt (1): + t0610: work around flaky test with concurrent writers + +Peter Krefting (1): + l10n: sv.po: Update Swedish translation + +Ralf Thielow (1): + l10n: Update German translation + +René Scharfe (1): + archive: fix misleading error message + +Teng Long (1): + l10n: zh_CN: updated translation for 2.47 + +Vũ Tiến Hưng (1): + l10n: vi: Updated translation for 2.47 + +Yi-Jyun Pan (1): + l10n: zh_TW: Git 2.47 + + +Version v2.47.0-rc1; changes since v2.47.0-rc0: +----------------------------------------------- + +Derrick Stolee (4): + credential: add new interactive config option + maintenance: add custom config to background jobs + scalar: configure maintenance during 'reconfigure' + sparse-checkout: disable advice in 'disable' + +Jeff King (25): + connect: clear child process before freeing in diagnostic mode + fetch-pack: free object filter before exiting + fetch-pack, send-pack: clean up shallow oid array + commit: avoid leaking already-saved buffer + send-pack: free cas options before exit + transport-helper: fix strbuf leak in push_refs_with_push() + fetch: free "raw" string when shrinking refspec + fetch-pack: clear pack lockfiles list + transport-helper: fix leak of dummy refs_list + http: fix leak when redacting cookies from curl trace + http: fix leak of http_object_request struct + http: call git_inflate_end() when releasing http_object_request + http: stop leaking buffer in http_get_info_packs() + remote-curl: free HEAD ref with free_one_ref() + http-walker: free fake packed_git list + http-push: clear refspecs before exiting + http-push: free repo->url string + http-push: free curl header lists + http-push: free transfer_request dest field + http-push: free transfer_request strbuf + http-push: free remote_ls_ctx.dentry_name + http-push: free xml_ctx.cdata after use + http-push: clean up objects list + http-push: clean up loose request when falling back to packed + http-push: clean up local_refs at exit + +Junio C Hamano (2): + another batch after 2.47-rc0 + Git 2.47-rc1 + +Patrick Steinhardt (31): + t1305: exercise edge cases of "onbranch" includes + config: fix evaluating "onbranch" with nonexistent git dir + refs/reftable: introduce "reftable.lockTimeout" + reftable/stack: allow locking of outdated stacks + refs/reftable: reload locked stack when preparing transaction + http-fetch: clear leaking git-index-pack(1) arguments + shallow: fix leak when unregistering last shallow root + fetch-pack: fix leaking sought refs + builtin/help: fix dangling reference to `html_path` + builtin/help: fix leaking `html_path` when reading config multiple times + git: fix leaking argv when handling builtins + submodule: fix leaking update strategy + builtin/submodule--helper: clear child process when not running it + builtin/submodule--helper: fix leaking error buffer + t/helper: fix leaking subrepo in nested submodule config helper + builtin/submodule--helper: fix leaking remote ref on errors + dir: fix off by one errors for ignored and untracked entries + builtin/pull: fix leaking "ff" option + diff: fix leaking orderfile option + parse-options: free previous value of `OPTION_FILENAME` + diffcore-order: fix leaking buffer when parsing orderfiles + builtin/repack: fix leaking configuration + builtin/difftool: plug several trivial memory leaks + trace2: destroy context stored in thread-local storage + submodule: fix leaking submodule ODB paths + grep: fix leaking grep pattern + promisor-remote: fix leaking partial clone filter + builtin/maintenance: fix leaking config string + builtin/maintenance: fix leak in `get_schedule_cmd()` + revision: fix leaking parents when simplifying commits + diffcore-break: fix leaking filespecs when merging broken pairs + +Phillip Wood (1): + submodule status: propagate SIGPIPE + +René Scharfe (2): + archive: load index before pathspec checks + commit-graph: remove unnecessary UNLEAK + +Taylor Blau (8): + finalize_object_file(): check for name collision before renaming + finalize_object_file(): refactor unlink_or_warn() placement + finalize_object_file(): implement collision check + pack-objects: use finalize_object_file() to rename pack/idx/etc + sha1: do not redefine `platform_SHA_CTX` and friends + hash.h: scaffolding for _unsafe hashing variants + Makefile: allow specifying a SHA-1 for non-cryptographic uses + csum-file.c: use unsafe SHA-1 implementation when available + + +Version v2.47.0-rc0; changes since v2.46.2: +------------------------------------------- + +AbdAlRahman Gad (8): + t7004: remove space after redirect operators + t7004: one command per line + t7004: use indented here-doc + t7004: do not prepare things outside test_expect_success + t7004: description on the same line as test_expect_success + t7004: begin the test body on the same line as test_expect_success + t7004: use single quotes instead of double quotes + t7004: make use of write_script + +Alex Galvin (3): + git-svn: add public property `svn:global-ignores` + git-svn: use `svn:global-ignores` to create .gitignore + git-svn: mention `svn:global-ignores` in help+docs + +Alex Henrie (2): + mergetools: vscode: new tool + apply: support --ours, --theirs, and --union for three-way merges + +Alexander Shopov (1): + show-ref: improve short help messages of options + +Andrew Kreimer (25): + attr: fix a typo + bloom: fix a typo + cbtree: fix a typo + config.mak.dev: fix a typo + diffcore-rename: fix typos + fsmonitor-settings: fix a typo + git-instaweb: fix a typo + git-p4: fix typos + gpg-interface: fix a typo + http: fix a typo + merge-ll: fix a typo + merge-ort: fix typos + object-file: fix a typo + pretty: fix a typo + read-cache-ll: fix a typo + rebase: fix a typo + refs: fix typos + revision: fix a typo + run-command: fix a typo + setup: fix a typo + sideband: fix a typo + upload-pack: fix a typo + ref-filter: fix a typo + Documentation/technical: fix a typo + builtin: fix typos + +Antonin Delpeuch (1): + merge-recursive: honor diff.algorithm + +Avi Halachmi (:avih) (8): + git-prompt: use here-doc instead of here-string + git-prompt: fix uninitialized variable + git-prompt: don't use shell arrays + git-prompt: replace [[...]] with standard code + git-prompt: add some missing quotes + git-prompt: don't use shell $'...' + git-prompt: ta-da! document usage in other shells + git-prompt: support custom 0-width PS1 markers + +Beat Bolli (1): + unicode: update the width tables to Unicode 16 + +Calvin Wan (1): + send-pack: add new tracing regions for push + +Carlo Marcelo Arenas Belón (1): + ci: update FreeBSD image to 13.4 + +Chandra Pratap (40): + t: move reftable/merged_test.c to the unit testing framework + t: harmonize t-reftable-merged.c with coding guidelines + t-reftable-merged: improve the test t_merged_single_record() + t-reftable-merged: improve the const-correctness of helper functions + t-reftable-merged: add tests for reftable_merged_table_max_update_index + t-reftable-merged: use reftable_ref_record_equal to compare ref records + t-reftable-merged: add test for REFTABLE_FORMAT_ERROR + reftable: remove unnecessary curly braces in reftable/pq.c + reftable: change the type of array indices to 'size_t' in reftable/pq.c + t: move reftable/pq_test.c to the unit testing framework + t-reftable-pq: make merged_iter_pqueue_check() static + t-reftable-pq: make merged_iter_pqueue_check() callable by reference + t-reftable-pq: add test for index based comparison + t-reftable-pq: add tests for merged_iter_pqueue_top() + reftable: remove unnecessary curly braces in reftable/tree.c + t: move reftable/tree_test.c to the unit testing framework + t-reftable-tree: split test_tree() into two sub-test functions + t-reftable-tree: add test for non-existent key + t-reftable-tree: improve the test for infix_walk() + t: move reftable/readwrite_test.c to the unit testing framework + t-reftable-readwrite: use free_names() instead of a for loop + t-reftable-readwrite: use 'for' in place of infinite 'while' loops + t-reftable-readwrite: add test for known error + t: move reftable/block_test.c to the unit testing framework + t: harmonize t-reftable-block.c with coding guidelines + t-reftable-block: release used block reader + t-reftable-block: use reftable_record_equal() instead of check_str() + t-reftable-block: use reftable_record_key() instead of strbuf_addstr() + t-reftable-block: use block_iter_reset() instead of block_iter_close() + t-reftable-block: use xstrfmt() instead of xstrdup() + t-reftable-block: remove unnecessary variable 'j' + t-reftable-block: add tests for log blocks + t-reftable-block: add tests for obj blocks + t-reftable-block: add tests for index blocks + t: move reftable/stack_test.c to the unit testing framework + t: harmonize t-reftable-stack.c with coding guidelines + t-reftable-stack: use Git's tempfile API instead of mkstemp() + t-reftable-stack: use reftable_ref_record_equal() to compare ref records + t-reftable-stack: add test for non-default compaction factor + t-reftable-stack: add test for stack iterators + +D Harithamma (1): + exec_cmd: RUNTIME_PREFIX on z/OS systems + +Derrick Stolee (7): + commit-reach: add get_branch_base_for_tip + commit: add gentle reference lookup method + for-each-ref: add 'is-base' token + p1500: add is-base performance tests + diff-index: integrate with the sparse index + scalar: add --no-tags option to 'scalar clone' + advice: recommend GIT_ADVICE=0 for tools + +Emily Shaffer (1): + Documentation: add platform support policy + +Eric Sunshine (8): + t3430: drop unnecessary one-shot "VAR=val shell-func" invocation + t4034: fix use of one-shot variable assignment with shell function + check-non-portable-shell: loosen one-shot assignment error message + check-non-portable-shell: suggest alternative for `VAR=val shell-func` + check-non-portable-shell: improve `VAR=val shell-func` detection + chainlint: don't be fooled by "?!...?!" in test body + chainlint: make error messages self-explanatory + chainlint: reduce annotation noise-factor + +Ghanshyam Thakkar (3): + t: port helper/test-hashmap.c to unit-tests/t-hashmap.c + t: migrate t0110-urlmatch-normalization to the new framework + t: port helper/test-oid-array.c to unit-tests/t-oid-array.c + +Jacob Keller (7): + t9001-send-email.sh: fix quoting for mailrc --dump-aliases test + t9001-send-email.sh: update alias list used for pine test + send-email: teach git send-email option to translate aliases + check-mailmap: accept "user@host" contacts + check-mailmap: add options for additional mailmap sources + send-email: add mailmap support via sendemail.mailmap and --mailmap + send-email: document --mailmap and associated configuration + +Jeff King (54): + midx: drop unused parameters from add_midx_to_chain() + refs: drop some unused parameters from create_symref_lock() + pack-bitmap: load writer config from repository parameter + pack-bitmap: drop unused parameters from select_pseudo_merges() + ref-filter: drop unused parameters from email_atom_option_parser() + diff-lib: drop unused index argument from get_stat_data() + imap-send: mark unused parameter in ssl_socket_connect() fallback + update-ref: mark more unused parameters in parser callbacks + refs: mark unused parameters in ref_store fsck callbacks + refs: mark unused parameters in do_for_each_reflog_helper() + oss-fuzz: mark unused argv/argc argument + t/helper: mark more unused argv/argc arguments + unit-tests: ignore unused argc/argv + reftable: ignore unused argc/argv in test functions + reftable: drop obsolete test function declarations + reftable: mark unused parameters in virtual functions + t-hashmap: mark unused parameters in callback function + test-mergesort: mark unused parameters in trivial callback + setup: mark unused parameter in config callback + daemon: mark unused parameters in non-posix fallbacks + scalar: mark unused parameters in dummy function + t-hashmap: stop calling setup() for t_intern() test + gc: mark unused config parameter in virtual functions + t-reftable-readwrite: mark unused parameter in callback function + compat: disable -Wunused-parameter in 3rd-party code + compat: disable -Wunused-parameter in win32/headless.c + compat: mark unused parameters in win32/mingw functions + config.mak.dev: enable -Wunused-parameter by default + CodingGuidelines: mention -Wunused-parameter and UNUSED + t-reftable-block: mark unused argv/argc + reftable: mark unused parameters in empty iterator functions + gc: drop MAYBE_UNUSED annotation from used parameter + grep: prefer UNUSED to MAYBE_UNUSED for pcre allocators + drop trailing newline from warning/error/die messages + sparse-checkout: consolidate cleanup when writing patterns + sparse-checkout: check commit_lock_file when writing patterns + sparse-checkout: use fdopen_lock_file() instead of xfdopen() + t6300: drop newline from wrapped test title + ref-filter: avoid extra copies of payload/signature + ref-filter: strip signature when parsing tag trailers + ref-filter: drop useless cast in trailers_atom_parser() + ref-filter: store ref_trailer_buf data per-atom + ref-filter: fix leak of %(trailers) "argbuf" + ref-filter: fix leak with %(describe) arguments + ref-filter: fix leak when formatting %(push:remoteref) + ref-filter: add ref_format_clear() function + imap-send: handle NO_OPENSSL even when openssl exists + t/interop: allow per-version make options + Git.pm: fix bare repository search with Directory option + Git.pm: use "rev-parse --absolute-git-dir" rather than perl code + print an error when remote helpers die during capabilities + git-jump: always specify column 1 for diff entries + git-jump: ignore deleted files in diff mode + t9001: use a more distinct fake BugID + +Johannes Schindelin (7): + clar: avoid compile error with mingw-w64 + clar(win32): avoid compile error due to unused `fs_copy()` + clar: stop including `shellapi.h` unnecessarily + clar: add CMake support + cmake: rename clar-related variables to avoid confusion + cmake: stop looking for `REFTABLE_TEST_OBJS` in the Makefile + cmake: generalize the handling of the `UNIT_TEST_OBJS` list + +John Cai (7): + refs: keep track of unresolved reference value in iterators + refs: add referent to each_ref_fn + ref-filter: populate symref from iterator + builtin: add a repository parameter for builtin functions + builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h + builtin: remove USE_THE_REPOSITORY for those without the_repository + add: pass in repo variable instead of global the_repository + +Josh Steadmon (2): + trace2: implement trace2_printf() for event target + fetch: add top-level trace2 regions + +Junio C Hamano (32): + ReviewingGuidelines: encourage positive reviews more + Start the 2.47 cycle + The second batch + t3206: test_when_finished before dirtying operations, not after + transport: fix leak with transport helper URLs + The third batch + remerge-diff: lazily prepare temporary objdir on demand + remerge-diff: clean up temporary objdir at a central place + The fourth batch + The fifth batch + The sixth batch + mailinfo: we parse fixed headers + The seventh batch + The eighth batch + The ninth batch + The tenth batch + The eleventh batch + CodingGuidelines: also mention MAYBE_UNUSED + refs/files-backend: work around -Wunused-parameter + The twelfth batch + The thirteenth batch + The fourteenth batch + The fifteenth batch + t5512.40 sometimes dies by SIGPIPE + The sixteenth batch + The seventeenth batch + ci updates + The eighteenth batch + The 19th batch + The 20th batch + The 21st batch + Git 2.47-rc0 + +Karthik Nayak (6): + clang-format: indent preprocessor directives after hash + clang-format: avoid spacing around bitfield colon + clang-format: formalize some of the spacing rules + ci: run style check on GitHub and GitLab + check-whitespace: detect if no base_commit is provided + ci/style-check: add `RemoveBracesLLVM` in CI job + +Kevin Lyles (2): + t1092: allow run_on_* functions to use standard input + builtin/cat-file: mark 'git cat-file' sparse-index compatible + +Matheus Tavares (1): + rebase --exec: respect --quiet + +Patrick Steinhardt (227): + refs: stop using `the_repository` + refs/files: stop using `the_repository` in `parse_loose_ref_contents()` + refs/files: stop using `the_repository` + refs/packed: stop using `the_repository` + refs/reftable: stop using `the_repository` + clang-format: fix indentation width for preprocessor directives + Documentation: clarify indentation style for C preprocessor directives + Documentation: document naming schema for structs and their functions + Documentation: document idiomatic function names + Documentation: consistently use spaces inside initializers + builtin/replay: plug leaking `advance_name` variable + builtin/log: fix leaking branch name when creating cover letters + builtin/describe: fix memory leak with `--contains=` + builtin/describe: fix leaking array when running diff-index + builtin/describe: fix trivial memory leak when describing blob + builtin/name-rev: fix various trivial memory leaks + builtin/submodule--helper: fix leaking clone depth parameter + builtin/submodule--helper: fix leaking buffer in `is_tip_reachable` + builtin/ls-remote: fix leaking `pattern` strings + builtin/remote: fix leaking strings in `branch_list` + builtin/remote: fix various trivial memory leaks + builtin/stash: fix various trivial memory leaks + builtin/rev-parse: fix memory leak with `--parseopt` + builtin/show-branch: fix several memory leaks + builtin/credential-store: fix leaking credential + builtin/rerere: fix various trivial memory leaks + builtin/shortlog: fix various trivial memory leaks + builtin/worktree: fix leaking derived branch names + builtin/credential-cache: fix trivial leaks + t/test-repository: fix leaking repository + object-name: fix leaking commit list items + entry: fix leaking pathnames during delayed checkout + convert: fix leaking config strings + commit-reach: fix trivial memory leak when computing reachability + refs: drop `ref_store`-less functions + transport: mark more tests leak-free + git-submodule.sh: break overly long command lines + builtin/submodule: allow cloning with different ref storage format + builtin/clone: propagate ref storage format to submodules + refs: fix ref storage format for submodule ref stores + builtin/submodule: allow "add" to use different ref storage format + submodule: fix leaking fetch tasks + submodule: fix leaking seen submodule names + object: fix leaking packfiles when closing object store + reftable/stack: refactor function to gather table sizes + reftable/stack: extract function to setup stack with N tables + reftable/stack: test compaction with already-locked tables + reftable/stack: update stats on failed full compaction + reftable/stack: simplify tracking of table locks + reftable/stack: do not die when fsyncing lock file files + reftable/stack: use lock_file when adding table to "tables.list" + reftable/stack: fix corruption on concurrent compaction + reftable/stack: handle locked tables during auto-compaction + path: expose `do_git_path()` as `repo_git_pathv()` + path: expose `do_git_common_path()` as `repo_common_pathv()` + editor: do not rely on `the_repository` for interactive edits + hooks: remove implicit dependency on `the_repository` + path: stop relying on `the_repository` when reporting garbage + path: stop relying on `the_repository` in `worktree_git_path()` + path: hide functions using `the_repository` by default + config: introduce missing setters that take repo as parameter + config: expose `repo_config_clear()` + config: pass repo to `git_config_get_index_threads()` + config: pass repo to `git_config_get_split_index()` + config: pass repo to `git_config_get_max_percent_split_change()` + config: pass repo to `git_config_get_expiry()` + config: pass repo to `git_config_get_expiry_in_days()` + config: pass repo to `git_die_config()` + config: pass repo to functions that rename or copy sections + config: don't have setters depend on `the_repository` + config: don't depend on `the_repository` with branch conditions + global: prepare for hiding away repo-less config functions + config: hide functions using `the_repository` by default + remote: plug memory leak when aliasing URLs + git: fix leaking system paths + object-file: fix memory leak when reading corrupted headers + object-name: fix leaking symlink paths in object context + bulk-checkin: fix leaking state TODO + read-cache: fix leaking hashfile when writing index fails + submodule-config: fix leaking name entry when traversing submodules + config: fix leaking comment character config + builtin/rebase: fix leaking `commit.gpgsign` value + builtin/notes: fix leaking `struct notes_tree` when merging notes + builtin/fast-import: plug trivial memory leaks + builtin/fast-export: fix leaking diff options + builtin/fast-export: plug leaking tag names + merge-ort: unconditionally release attributes index + sequencer: release todo list on error paths + unpack-trees: clear index when not propagating it + diff: fix leak when parsing invalid ignore regex option + builtin/format-patch: fix various trivial memory leaks + userdiff: fix leaking memory for configured diff drivers + builtin/log: fix leak when showing converted blob contents + diff: free state populated via options + builtin/diff: free symmetric diff members + config: fix constness of out parameter for `git_config_get_expiry()` + builtin/gc: refactor to read config into structure + builtin/gc: fix leaking config values + builtin/gc: stop processing log file on signal + builtin/gc: add a `--detach` flag + builtin/maintenance: add a `--detach` flag + run-command: fix detaching when running auto maintenance + t0001: exercise initialization with ref formats more thoroughly + t0001: delete repositories when object format tests finish + setup: merge configuration of repository formats + setup: make object format configurable via config + setup: make ref storage format configurable via config + t7900: fix flaky test due to leaking background job + t7900: exercise detaching via trace2 regions + builtin/maintenance: fix loose objects task emitting pack hash + reftable/merged: expose functions to initialize iterators + reftable/merged: rename `reftable_new_merged_table()` + reftable/merged: stop using generic tables in the merged table + reftable/stack: open-code reading refs + reftable/iter: drop double-checking logic + reftable/generic: move generic iterator code into iterator interface + reftable/dump: drop unused `compact_stack()` + t/helper: inline `reftable_dump_main()` + t/helper: inline `reftable_reader_print_file()` + t/helper: inline `reftable_stack_print_directory()` + t/helper: inline `reftable_table_print()` + t/helper: inline printing of reftable records + t/helper: use `hash_to_hex_algop()` to print hashes + t/helper: refactor to not use `struct reftable_table` + reftable/generic: drop interface + mailinfo: fix leaking header data + convert: fix leaks when resetting attributes + pretty: fix memory leaks when parsing pretty formats + pretty: fix leaking key/value separator buffer + builtin/merge-tree: fix leaking `-X` strategy options + builtin/upload-archive: fix leaking args passed to `write_archive()` + builtin/archive: fix leaking `OPT_FILENAME()` value + midx-write: fix leaking hashfile on error cases + builtin/repack: fix leaks when computing packs to repack + t/helper: fix leaking multi-pack-indices in "read-midx" + transport: fix leaking OID arrays in git:// transport data + builtin/send-pack: fix leaking refspecs + sideband: fix leaks when configuring sideband colors + builtin/fetch-pack: fix leaking refs + remote: fix leaking config strings + remote: fix leaks when matching refspecs + remote: fix leaking peer ref when expanding refmap + builtin/fetch: fix leaking transaction with `--atomic` + transport: fix leaking arguments when fetching from bundle + transport: fix leaking negotiation tips + reftable/blocksource: drop malloc block source + reftable/stack: inline `stack_compact_range_stats()` + reftable/reader: rename `reftable_new_reader()` + reftable/reader: inline `init_reader()` + reftable/reader: inline `reader_close()` + reftable/stack: fix broken refnames in `write_n_ref_tables()` + reftable/reader: introduce refcounting + reftable/reader: keep readers alive during iteration + reftable/stack: reorder swapping in the reloaded stack contents + reftable/stack: fix segfault when reload with reused readers fails + Documentation/BreakingChanges: announce removal of git-pack-redundant(1) + wrapper: introduce `log2u()` + t0601: merge tests for auto-packing of refs + refs/files: use heuristic to decide whether to repack with `--auto` + t: do not pass GIT_TEST_OPTS to unit tests with prove + t: import the clar unit testing framework + t/clar: fix compatibility with NonStop + Makefile: fix sparse dependency on GENERATED_H + Makefile: make hdr-check depend on generated headers + Makefile: do not use sparse on third-party sources + Makefile: wire up the clar unit testing framework + t/unit-tests: implement test driver + t/unit-tests: convert strvec tests to use clar + t/unit-tests: convert ctype tests to use clar + t/test-lib: allow skipping leak checks for passing tests + fetch-pack: fix memory leaks on fetch negotiation + send-pack: fix leaking common object IDs + builtin/push: fix leaking refspec query result + upload-pack: fix leaking child process data on reachability checks + submodule: fix leaking fetch task data + builtin/submodule--helper: fix leaking refs on push-check + remote: fix leaking tracking refs + remote: fix leak in reachability check of a remote-tracking ref + send-pack: fix leaking push cert nonce + gpg-interface: fix misdesigned signing key interfaces + object: clear grafts when clearing parsed object pool + shallow: free grafts when unregistering them + shallow: fix leaking members of `struct shallow_info` + negotiator/skipping: fix leaking commit entries + builtin/repack: fix leaking line buffer when packing promisors + builtin/pack-objects: plug leaking list of keep-packs + builtin/grep: fix leaking object context + builtin/fmt-merge-msg: fix leaking buffers + match-trees: fix leaking prefixes in `shift_tree()` + merge-ort: fix two leaks when handling directory rename modifications + builtin/repack: fix leaking keep-pack list + ref-filter: fix leak with unterminated %(if) atoms + Makefile: rename clar-related variables to avoid confusion + environment: make `get_git_dir()` accept a repository + environment: make `get_git_common_dir()` accept a repository + environment: make `get_object_directory()` accept a repository + environment: make `get_index_file()` accept a repository + environment: make `get_graft_file()` accept a repository + environment: make `get_git_work_tree()` accept a repository + config: document `read_early_config()` and `read_very_early_config()` + config: make dependency on repo in `read_early_config()` explicit + environment: move object database functions into object layer + environment: make `get_git_namespace()` self-contained + environment: move `set_git_dir()` and related into setup layer + environment: reorder header to split out `the_repository`-free section + environment: guard state depending on a repository + repo-settings: split out declarations into a standalone header + repo-settings: track defaults close to `struct repo_settings` + branch: stop modifying `log_all_ref_updates` variable + refs: stop modifying global `log_all_ref_updates` variable + environment: stop storing "core.logAllRefUpdates" globally + environment: stop storing "core.preferSymlinkRefs" globally + environment: stop storing "core.warnAmbiguousRefs" globally + environment: stop storing "core.notesRef" globally + refs: properly apply exclude patterns to namespaced refs + builtin/receive-pack: fix exclude patterns when announcing refs + Makefile: stop listing test library objects twice + t/unit-tests: introduce reftable library + reftable/reader: make table iterator reseekable + refs/reftable: wire up support for exclude patterns + apply: reorder functions to move image-related things together + apply: rename functions operating on `struct image` + apply: introduce macro and function to init images + apply: refactor code to drop `line_allocated` + apply: rename members that track line count and allocation length + apply: refactor `struct image` to use a `struct strbuf` + gitlab-ci: upgrade machine type of Linux runners + +Phillip Wood (1): + rebase: apply and cleanup autostash when rebase fails to start + +Ramsay Jones (2): + Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS + config.mak.uname: remove unused uname_P variable + +René Scharfe (12): + t-strvec: use test_msg() + t-strvec: improve check_strvec() output + t-strvec: fix type mismatch in check_strvec + grep: -W: skip trailing empty lines at EOF, too + t0080: use here-doc test body + unit-tests: show location of checks outside of tests + unit-tests: add if_test + t-ctype: use if_test + t-reftable-basics: use if_test + t-strvec: use if_test + remote: plug memory leaks at early returns + diff: report modified binary files as changes in builtin_diff() + +Rubén Justo (4): + add-patch: test for 'p' command + pager: do not close fd 2 unnecessarily + pager: introduce wait_for_pager + add-patch: render hunks through the pager + +Ryan Hendrickson (1): + http: do not ignore proxy path + +Stephen P. Smith (1): + .mailmap document current address. + +Taylor Blau (33): + t/t7704-repack-cruft.sh: avoid failures during long-running tests + Documentation: describe incremental MIDX format + midx: add new fields for incremental MIDX chains + midx: teach `nth_midxed_pack_int_id()` about incremental MIDXs + midx: teach `prepare_midx_pack()` about incremental MIDXs + midx: teach `nth_midxed_object_oid()` about incremental MIDXs + midx: teach `nth_bitmapped_pack()` about incremental MIDXs + midx: introduce `bsearch_one_midx()` + midx: teach `bsearch_midx()` about incremental MIDXs + midx: teach `nth_midxed_offset()` about incremental MIDXs + midx: teach `fill_midx_entry()` about incremental MIDXs + midx: remove unused `midx_locate_pack()` + midx: teach `midx_contains_pack()` about incremental MIDXs + midx: teach `midx_preferred_pack()` about incremental MIDXs + midx: teach `midx_fanout_add_midx_fanout()` about incremental MIDXs + midx: support reading incremental MIDX chains + midx: implement verification support for incremental MIDXs + t: retire 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' + t/t5313-pack-bounds-checks.sh: prepare for sub-directories + midx: implement support for writing incremental MIDX chains + pack-bitmap: initialize `bitmap_writer_init()` with packing_data + pack-bitmap: drop redundant args from `bitmap_writer_build_type_index()` + pack-bitmap: drop redundant args from `bitmap_writer_build()` + pack-bitmap: drop redundant args from `bitmap_writer_finish()` + pack-bitmap-write.c: select pseudo-merges even for small bitmaps + t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groups + pseudo-merge.c: do not generate empty pseudo-merge commits + pseudo-merge.c: ensure pseudo-merge groups are closed + t/t5332-multi-pack-reuse.sh: verify pack generation with --strict + pack-bitmap: tag bitmapped packs with their corresponding MIDX + builtin/pack-objects.c: translate bit positions during pack-reuse + pack-bitmap.c: avoid repeated `pack_pos_to_offset()` during reuse + builtin/pack-objects.c: do not open-code `MAX_PACK_OBJECT_HEADER` + +shejialuo (9): + fsck: rename "skiplist" to "skip_oids" + fsck: rename objects-related fsck error functions + fsck: make "fsck_error" callback generic + fsck: add a unified interface for reporting fsck messages + fsck: add refs report function + refs: set up ref consistency check infrastructure + builtin/refs: add verify subcommand + files-backend: add unified interface for refs scanning + fsck: add ref name check for files backend + + +Version v2.46.2; changes since v2.46.1: +--------------------------------------- + +Brian Lyles (1): + interpret-trailers: handle message without trailing newline + +Jeff King (4): + ci: drop run-docker scripts + ci: unify ubuntu and ubuntu32 dependencies + ci: use more recent linux32 image + ci: use regular action versions for linux32 job + +Junio C Hamano (5): + doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch + ci: remove 'Upload failed tests' directories' step from linux32 jobs + Revert "Merge branch 'jc/patch-id' into maint-2.46" + Start preparing for Git 2.46.2 + Git 2.46.2 + +Martin Ågren (2): + t1517: add missing LIBCURL prereq + t0211: add missing LIBCURL prereq + +Patrick Steinhardt (1): + ci: add Ubuntu 16.04 job to GitLab CI + +Ramsay Jones (1): + config.mak.uname: add HAVE_DEV_TTY to cygwin config section + +René Scharfe (2): + diff: report copies and renames as changes in run_diff_cmd() + diff: report dirty submodules as changes in builtin_diff() + + +Version v2.46.1; changes since v2.46.0: +--------------------------------------- + +Celeste Liu (1): + doc: replace 3 dash with correct 2 dash in git-config(1) + +D Harithamma (1): + convert: return early when not tracing + +David Disseldorp (1): + notes: do not trigger editor when adding an empty note + +Jayson Rhynas (1): + doc: fix hex code escapes in git-ls-files + +Jeff King (4): + credential/osxkeychain: respect NUL terminator in username + apply: canonicalize modes read from patches + t4129: fix racy index when calling chmod after git-add + revision: free commit buffers for skipped commits + +Johannes Schindelin (2): + ci: bump microsoft/setup-msbuild from v1 to v2 + ci(win+VS): download the vcpkg artifacts using a dedicated GitHub Action + +Junio C Hamano (30): + checkout: special case error messages during noop switching + doc: note that AT&T ksh does not work with our test suite + Revert "reflog expire: don't use lookup_commit_reference_gently()" + howto-maintain: cover a whole development cycle + howto-maintain: update daily tasks + CodingGuidelines: document a shell that "fails" "VAR=VAL shell_func" + doc: difference in location to apply is "offset", not "fuzz" + mailmap: plug memory leak in read_mailmap_blob() + csum-file: introduce discard_hashfile() + t4204: patch-id supports various input format + patch-id: call flush_current_id() only when needed + patch-id: make get_one_patchid() more extensible + patch-id: rewrite code that detects the beginning of a patch + patch-id: tighten code to detect the patch header + safe.directory: preliminary clean-up + safe.directory: normalize the checked path + safe.directory: normalize the configured path + safe.directory: setting safe.directory="." allows the "current" directory + t0018: remove leftover debugging cruft + tests: drop use of 'tee' that hides exit status + tutorial: grammofix + doc: grammofix in git-diff-tree + howto-maintain: mention preformatted docs + Prepare for 2.46.1 + CodingGuidelines: spaces around C operators + A bit more topics for 2.46.x maintenance track + git-config.1: --get-all description update + git-config.1: fix description of --regexp in synopsis + Another batch of topics for 2.46.1 + Git 2.46.1 + +Justin Tobler (1): + doc: clarify post-receive hook behavior + +Kousik Sanagavarapu (1): + unit-tests/test-lib: fix typo in check_pointer_eq() description + +Kyle Lippincott (2): + set errno=0 before strtoX calls + t6421: fix test to work when repo dir contains d0 + +Patrick Steinhardt (8): + t98xx: fix Perforce tests with p4d r23 and newer + ci: update Perforce version to r23.2 + t98xx: mark Perforce tests as memory-leak free + builtin/ls-remote: fall back to SHA1 outside of a repo + builtin/bundle: have unbundle check for repo before opening its bundle + bundle: default to SHA1 when reading bundle headers + builtin/stash: fix `--keep-index --include-untracked` with empty HEAD + builtin/index-pack: fix segfaults when running outside of a repo + +Phillip Wood (2): + add-patch: handle splitting hunks with diff.suppressBlankEmpty + add-patch: use normalize_marker() when recounting edited hunk + +Ramsay Jones (1): + compat/terminal: mark parameter of git_terminal_prompt() UNUSED + +René Scharfe (2): + t-example-decorate: remove test messages + log-tree: use decimal_width() + +Sven Strickroth (1): + refs/files: prevent memory leak by freeing packed_ref_store + +Taylor Blau (1): + config.c: avoid segfault with --fixed-value and valueless config + +Tomas Nordin (1): + doc: remove dangling closing parenthesis + +Xing Xin (1): + diff-tree: fix crash when used with --remerge-diff + +ahmed akef (1): + docs: explain the order of output in the batched mode of git-cat-file(1) + + +Version v2.46.0; changes since v2.46.0-rc2: +------------------------------------------- + +Alexander Shopov (1): + l10n: bg.po: Updated Bulgarian translation (5734t) + +Arkadii Yakovets (1): + l10n: uk: v2.46 update + +Bagas Sanjaya (1): + l10n: po-id for 2.46 + +Emir SARI (1): + l10n: tr: Update Turkish translations + +Jean-Noël Avila (1): + l10n: fr: v2.46.0 + +Junio C Hamano (1): + Git 2.46 + +Peter Krefting (1): + l10n: sv.po: Update Swedish translation + +Ralf Thielow (1): + l10n: Update German translation + +Teng Long (1): + l10n: zh_CN: updated translation for 2.46 + +Vũ Tiến Hưng (1): + l10n: vi: Updated translation for 2.46 + +Yi-Jyun Pan (1): + l10n: zh_TW: Git 2.46 + + +Version v2.46.0-rc2; changes since v2.46.0-rc1: +----------------------------------------------- + +Derrick Stolee (2): + t5319: add failing test case for repack/expire + midx-write: revert use of --stdin-packs + +Jean-Noël Avila (1): + doc: git-clone fix discrepancy between asciidoc and asciidoctor + +Johannes Schindelin (1): + asciidoctor: fix `synopsis` rendering + +Junio C Hamano (2): + Doc: fix Asciidoctor css workaround + Git 2.46-rc2 + +Patrick Steinhardt (1): + refs: fix format migration on Cygwin + + +Version v2.46.0-rc1; changes since v2.46.0-rc0: +----------------------------------------------- + +Abhijeet Sonar (1): + describe: refresh the index when 'broken' flag is used + +Chandra Pratap (11): + t: move reftable/record_test.c to the unit testing framework + t-reftable-record: add reftable_record_cmp() tests for log records + t-reftable-record: add comparison tests for ref records + t-reftable-record: add comparison tests for index records + t-reftable-record: add comparison tests for obj records + t-reftable-record: add ref tests for reftable_record_is_deletion() + t-reftable-record: add log tests for reftable_record_is_deletion() + t-reftable-record: add obj tests for reftable_record_is_deletion() + t-reftable-record: add index tests for reftable_record_is_deletion() + t-reftable-record: add tests for reftable_ref_record_compare_name() + t-reftable-record: add tests for reftable_log_record_compare_key() + +Christian Hesse (1): + refs: correct the version numbers in a comment + +Csókás, Bence (1): + git-send-email: use sanitized address when reading mbox body + +Derrick Stolee (1): + advice: warn when sparse index expands + +Elijah Newren (8): + merge-ort: extract handling of priv member into reusable function + merge-ort: maintain expected invariant for priv member + merge-ort: fix type of local 'clean' var in handle_content_merge () + merge-ort: clearer propagation of failure-to-function from merge_submodule + merge-ort: loosen commented requirements + merge-ort: upon merge abort, only show messages causing the abort + merge-ort: convert more error() cases to path_msg() + merge-ort: fix missing early return + +Eric Sunshine (1): + chainlint.pl: recognize test bodies defined via heredoc + +Ghanshyam Thakkar (1): + t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c + +Jeff King (13): + t5553: use local url for invalid fetch + t5551: do not confirm that bogus url cannot be used + t/lib-bundle-uri: use local fake bundle URLs + chainlint.pl: add test_expect_success call to test snippets + chainlint.pl: only start threads if jobs > 1 + chainlint.pl: do not spawn more threads than we have scripts + chainlint.pl: force CRLF conversion when opening input files + chainlint.pl: check line numbers in expected output + chainlint.pl: add tests for test body in heredoc + test-lib: allow test snippets as here-docs + t: convert some here-doc test bodies + t/.gitattributes: ignore whitespace in chainlint expect files + t4153: stop redirecting input from /dev/zero + +Jesús Ariel Cabello Mateos (1): + gitweb: rss/atom change published/updated date to committer date + +Johannes Schindelin (8): + cmake: fix build of `t-oidtree` + run-command: refactor getting the Unix shell path into its own function + strvec: declare the `strvec_push_nodup()` function globally + win32: override `fspathcmp()` with a directory separator-aware version + mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too + run-command(win32): resolve the path to the Unix shell early + run-command: declare the `git_shell_path()` function globally + var(win32): do report the GIT_SHELL_PATH that is actually used + +Junio C Hamano (7): + push: avoid showing false negotiation errors + ci: unify bash calling convention + http.c: cookie file tightening + Post 2.46-rc0 batch #1 + Post 2.46-rc0 batch #2 + Post 2.46-rc0 batch #3 + Git 2.46-rc1 + +Karthik Nayak (1): + builtin/push: call set_refspecs after validating remote + +Martin Ågren (2): + Documentation/gitpacking: make sample configs listing blocks + Documentation/glossary: fix double word + +Piotr Szlazak (1): + doc: update http.cookieFile with in-memory cookie processing + +René Scharfe (1): + clang-format: include kh_foreach* macros in ForEachMacros + +Rikita Ishikawa (1): + doc: fix the max number of branches shown by "show-branch" + +Rubén Justo (4): + t0613: mark as leak-free + test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG + t0612: mark as leak-free + test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default + +Taylor Blau (2): + config.mak.dev: fix typo when enabling -Wpedantic + Documentation: fix default value for core.maxTreeDepth + +brian m. carlson (5): + gitfaq: add documentation on proxies + gitfaq: give advice on using eol attribute in gitattributes + gitfaq: add entry about syncing working trees + doc: mention that proxies must be completely transparent + http: allow authenticating proactively + + +Version v2.46.0-rc0; changes since v2.45.2: +------------------------------------------- + +Aaron Plattner (1): + credential: clear expired c->credential, unify secret clearing + +Abhijeet Sonar (1): + pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt" + +Adam Johnson (1): + stash: fix "--staged" with binary files + +Beat Bolli (3): + t/t4026-color: remove an extra double quote character + t/t4026-color: add test coverage for invalid RGB colors + color: add support for 12-bit RGB colors + +Chandra Pratap (5): + t: move reftable/basics_test.c to the unit testing framework + t: move tests from reftable/stack_test.c to the new unit test + t: move tests from reftable/record_test.c to the new unit test + t: add test for put_be16() + t: improve the test-case for parse_names() + +D. Ben Knoble (1): + completion: zsh: stop leaking local cache variable + +Darcy Burke (1): + date: detect underflow/overflow when parsing dates with timezone offset + +Derrick Stolee (7): + scalar: avoid segfault in reconfigure --all + commit-graph: increment progress indicator + sparse-checkout: refactor skip worktree retry logic + sparse-index: refactor path_found() + sparse-index: use strbuf in path_found() + sparse-index: count lstat() calls + sparse-index: improve lstat caching of sparse paths + +Dov Murik (1): + documentation: git-update-index: add --show-index-version to synopsis + +Dr. David Alan Gilbert (1): + fetch-pack: remove unused 'struct loose_object_iter' + +Dragan Simic (3): + send-email: move newline characters out of a few translatable strings + format-patch: ensure that --rfc and -k are mutually exclusive + doc: interactive.singleKey is disabled by default + +Eric Sunshine (2): + chainlint.pl: make CPU count computation more robust + chainlint.pl: latch CPU count directly reported by /proc/cpuinfo + +Eric Wong (3): + Git.pm: use array in command_bidi_pipe example + t1006: ensure cat-file info isn't buffered by default + object-file: fix leak on conversion failure + +Fahad Alrashed (1): + git-p4: show Perforce error to the user + +Ghanshyam Thakkar (5): + t/: port helper/test-strcmp-offset.c to unit-tests/t-strcmp-offset.c + t/: migrate helper/test-example-decorate to the unit testing framework + strbuf: introduce strbuf_addstrings() to repeatedly add a string + t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash + t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c + +Ian Wienand (3): + Documentation: alias: rework notes into points + Documentation: alias: add notes on shell expansion + run-command: show prepared command + +Ivan Tse (1): + refs: return conflict error when checking packed refs + +James Liu (3): + doc: clean up usage documentation for --no-* opts + doc: add spacing around paginate options + advice: add --no-advice global option + +Jeff King (41): + t/Makefile: run unit tests alongside shell tests + ci: update coverity runs_on_pool reference + ci: drop mention of BREW_INSTALL_PACKAGES variable + ci: avoid bare "gcc" for osx-gcc job + ci: stop installing "gcc-13" for osx-gcc + t-strvec: use va_end() to match va_start() + t-strvec: mark variable-arg helper with LAST_ARG_MUST_BE_NULL + mv: move src_dir cleanup to end of cmd_mv() + mv: factor out empty src_dir removal + mv: replace src_dir with a strvec + dir.c: skip .gitignore, etc larger than INT_MAX + sparse-checkout: free string list in write_cone_to_file() + sparse-checkout: pass string literals directly to add_pattern() + dir.c: free strings in sparse cone pattern hashmaps + sparse-checkout: clear patterns when init() sees existing sparse file + dir.c: free removed sparse-pattern hashmap entries + dir.c: reduce max pattern file size to 100MB + dir.c: always copy input to add_pattern() + sparse-checkout: reuse --stdin buffer when reading patterns + sparse-checkout: always free "line" strbuf after reading input + sparse-checkout: refactor temporary sparse_checkout_patterns + sparse-checkout: free sparse_filename after use + sparse-checkout: free pattern list in sparse_checkout_list() + sparse-checkout: free string list after displaying + sparse-checkout: free duplicate hashmap entries + am: add explicit "--retry" option + test-terminal: drop stdin handling + imap-send: free all_msgs strbuf in "out" label + archive: fix check for missing url + remote: refactor alias_url() memory ownership + remote: transfer ownership of memory in add_url(), etc + remote: use strvecs to store remote url/pushurl + remote: simplify url/pushurl selection + config: document remote.*.url/pushurl interaction + remote: allow resetting url list + t5801: make remote-testgit GIT_DIR setup more robust + t5801: test remote.*.vcs config + remote: always require at least one url in a remote + remote: drop checks for zero-url case + fetch-pack: fix segfault when fscking without --lock-pack + t5500: fix mistaken $SERVER reference in helper function + +Johannes Schindelin (4): + for-each-repo: optionally keep going on an error + maintenance: running maintenance should not stop on errors + cmake: let `test-tool` run the unit tests, too + mingw: drop bogus (and unneeded) declaration of `_pgmptr` + +Johannes Sixt (1): + git-gui: note the new maintainer + +John Passaro (3): + builtin/commit: use ARGV macro to collect trailers + builtin/commit: refactor --trailer logic + builtin/tag: add --trailer option + +John Paul Adrian Glaubitz (1): + chainlint.pl: fix incorrect CPU count on Linux SPARC + +Jonathan Tan (1): + gitformat-commit-graph: describe version 2 of BDAT + +Josh Soref (2): + doc: update links to current pages + doc: switch links to https + +Josh Steadmon (8): + fuzz: link fuzz programs with `make all` on Linux + t0080: turn t-basic unit test into a helper + test-tool run-command testsuite: get shell from env + test-tool run-command testsuite: remove hardcoded filter + test-tool run-command testsuite: support unit tests + unit tests: add rule for running with test-tool + ci: use test-tool as unit test runner on Windows + doc: describe the project's decision-making process + +Junio C Hamano (61): + format-patch: allow --rfc to optionally take a value, like --rfc=WIP + format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)] + Start the 2.46 cycle + rev-parse: document how --is-* options work outside a repository + t/lib-chunk: work around broken "mv" on some vintage of macOS + stop using HEAD for attributes in bare repository by default + Makefile(s): do not enforce "all indents must be done with tab" + format-patch: run range-diff with larger creation-factor + t0018: two small fixes + The second batch + SubmittingPatches: move the patch-flow section earlier + SubmittingPatches: extend the "flow" section + SubmittingPatches: welcome the new maintainer of git-gui part + compat/regex: fix argument order to calloc(3) + The third batch + The fourth batch + Revert "diff: fix --exit-code with external diff" + The fifth batch + t0017: clarify dubious test set-up + SubmittingPatches: advertise git-manpages-l10n project a bit + diff: document what --name-only shows + The sixth batch + setup: add an escape hatch for "no more default hash algorithm" change + t1517: test commands that are designed to be run outside repository + apply: fix uninitialized hash function + add-patch: enforce only one-letter response to prompts + The seventh batch + show_log: factor out interdiff/range-diff generation + format-patch: move range/inter diff at the end of a single patch output + The eighth batch + safe.directory: allow "lead/ing/path/*" match + The ninth batch + t1517: more coverage for commands that work without repository + Post 2.45.2 updates + The tenth batch + imap-send: minimum leakfix + refs: call branches branches + ls-remote: introduce --branches and deprecate --heads + show-ref: introduce --branches and deprecate --heads + attr.tree: HEAD:.gitattributes is no longer the default in a bare repo + add-i: finally retire add.interactive.useBuiltin + The eleventh batch + worktree_git_path(): move the declaration to path.h + __attribute__: trace2_region_enter_printf() is like "printf" + __attribute__: remove redundant attribute declaration for git_die_config() + __attribute__: mark some functions with LAST_ARG_MUST_BE_NULL + __attribute__: add a few missing format attributes + The twelfth batch + The thirteenth batch + The fourteenth batch + The fifteenth batch + fuzz: minimum fuzzers environment lacks libcURL + The sixteenth batch + t0006: simplify prerequisites + archive: document that --add-virtual-file takes full path + The seventeenth batch + More post 2.45.2 updates from the 'master' front + Yet another batch of post 2.45.2 updates from the 'master' front + The eighteenth batch + The ninteenth batch + Git 2.46-rc0 + +Justin Tobler (6): + doc: clarify practices for submitting updated patch versions + ci: pre-collapse GitLab CI sections + github-ci: fix link to whitespace error + ci: separate whitespace check script + ci: make the whitespace report optional + gitlab-ci: add whitespace error check + +Karthik Nayak (16): + refs: accept symref values in `ref_transaction_update()` + files-backend: extract out `create_symref_lock()` + refs: support symrefs in 'reference-transaction' hook + refs: move `original_update_refname` to 'refs.c' + refs: add support for transactional symref updates + refs: use transaction in `refs_create_symref()` + refs: rename `refs_create_symref()` to `refs_update_symref()` + refs: remove `create_symref` and associated dead code + SubmittingPatches: add section for iterating patches + refs: create and use `ref_update_expects_existing_old_ref()` + refs: specify error for regular refs with `old_target` + update-ref: add support for 'symref-verify' command + update-ref: add support for 'symref-delete' command + update-ref: add support for 'symref-create' command + reftable: pick either 'oid' or 'target' for new updates + update-ref: add support for 'symref-update' command + +Koji Nakamaru (2): + osxkeychain: exclusive lock to serialize execution of operations + osxkeychain: state to skip unnecessary store operations + +Kyle Lippincott (1): + attr: fix msan issue in read_attr_from_index + +Kyle Zhao (1): + merge: avoid write merge state when unable to write index + +Linus Arver (18): + MyFirstContribution: mention contrib/contacts/git-contacts + SubmittingPatches: clarify 'git-contacts' location + SubmittingPatches: mention GitGitGadget + SubmittingPatches: quote commands + SubmittingPatches: discuss reviewers first + SubmittingPatches: dedupe discussion of security patches + SubmittingPatches: add heading for format-patch and send-email + SubmittingPatches: demonstrate using git-contacts with git-send-email + Makefile: sort UNIT_TEST_PROGRAMS + trailer: add unit tests for trailer iterator + trailer: teach iterator about non-trailer lines + sequencer: use the trailer iterator + interpret-trailers: access trailer_info with new helpers + trailer: make parse_trailers() return trailer_info pointer + trailer: make trailer_info struct private + trailer: retire trailer_info_get() from API + trailer: document parse_trailers() usage + trailer unit tests: inspect iterator contents + +Marcel Telka (9): + t/t0211-trace2-perf.sh: fix typo patern -> pattern + Switch grep from non-portable BRE to portable ERE + t/t9902-completion.sh: backslashes in echo + t/t0600-reffiles-backend.sh: rm -v is not portable + t/t4202-log.sh: fix misspelled variable + t/t1700-split-index.sh: mv -v is not portable + t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon + t/t9001-send-email.sh: sed - remove the i flag for s + scalar: make enlistment delete to work on all POSIX platforms + +Mike Hommey (1): + win32: fix building with NO_UNIX_SOCKETS + +Orgad Shaneh (1): + git-gui: fix inability to quit after closing another instance + +Patrick Steinhardt (262): + refs/reftable: fix D/F conflict error message on ref copy + refs/reftable: perform explicit D/F check when writing symrefs + refs/reftable: skip duplicate name checks + reftable: remove name checks + refs/reftable: don't recompute committer ident + reftable/writer: refactorings for `writer_add_record()` + reftable/writer: refactorings for `writer_flush_nonempty_block()` + reftable/writer: unify releasing memory + reftable/writer: reset `last_key` instead of releasing it + reftable/block: reuse zstream when writing log blocks + reftable/block: reuse compressed array + ci: rename "runs_on_pool" to "distro" + ci: expose distro name in dockerized GitHub jobs + ci: skip sudo when we are already root + ci: drop duplicate package installation for "linux-gcc-default" + ci: convert "install-dependencies.sh" to use "/bin/sh" + ci: merge custom PATH directories + ci: fix setup of custom path for GitLab CI + ci: merge scripts which install dependencies + ci: make Perforce binaries executable for all users + ci: install JGit dependency + t06xx: always execute backend-specific tests + t0610: fix non-portable variable assignment + t0612: add tests to exercise Git/JGit reftable compatibility + t/helper: stop using `the_index` + builtin: stop using `the_index` + repository: initialize index in `repo_init()` + builtin/clone: stop using `the_index` + repository: drop `the_index` variable + repository: drop `initialize_the_repository()` + config: clarify memory ownership when preparing comment strings + builtin/config: move option array around + builtin/config: move "fixed-value" option to correct group + builtin/config: use `OPT_CMDMODE()` to specify modes + builtin/config: pull out function to handle config location + builtin/config: pull out function to handle `--null` + builtin/config: introduce "list" subcommand + builtin/config: introduce "get" subcommand + builtin/config: introduce "set" subcommand + builtin/config: introduce "unset" subcommand + builtin/config: introduce "rename-section" subcommand + builtin/config: introduce "remove-section" subcommand + builtin/config: introduce "edit" subcommand + builtin/config: display subcommand help + gitlab-ci: add smoke test for fuzzers + ci: fix Python dependency on Ubuntu 24.04 + path: harden validation of HEAD with non-standard hashes + path: move `validate_headref()` to its only user + parse-options-cb: only abbreviate hashes when hash algo is known + attr: don't recompute default attribute source + attr: fix BUG() when parsing attrs outside of repo + remote-curl: fix parsing of detached SHA256 heads + builtin/rev-parse: allow shortening to more than 40 hex characters + builtin/blame: don't access potentially unitialized `the_hash_algo` + builtin/bundle: abort "verify" early when there is no repository + builtin/diff: explicitly set hash algo when there is no repo + builtin/shortlog: don't set up revisions without repo + oss-fuzz/commit-graph: set up hash algorithm + repository: stop setting SHA1 as the default object hash + refs: introduce missing functions that accept a `struct ref_store` + refs: add `exclude_patterns` parameter to `for_each_fullref_in()` + cocci: introduce rules to transform "refs" to pass ref store + cocci: apply rules to rewrite callers of "refs" interfaces + refs: remove functions without ref store + gitlab-ci: fix installing dependencies for fuzz smoke tests + reftable: consistently refer to `reftable_write_options` as `opts` + reftable: pass opts as constant pointer + reftable/writer: drop static variable used to initialize strbuf + reftable/writer: improve error when passed an invalid block size + reftable/dump: support dumping a table's block structure + refs/reftable: allow configuring block size + reftable: use `uint16_t` to track restart interval + refs/reftable: allow configuring restart interval + refs/reftable: allow disabling writing the object index + reftable: make the compaction factor configurable + refs/reftable: allow configuring geometric factor + reftable/block: use `size_t` to track restart point index + reftable/reader: avoid copying index iterator + reftable/reader: unify indexed and linear seeking + reftable/reader: separate concerns of table iter and reftable reader + reftable/reader: inline `reader_seek_internal()` + reftable/reader: set up the reader when initializing table iterator + reftable/merged: split up initialization and seeking of records + reftable/merged: simplify indices for subiterators + reftable/generic: move seeking of records into the iterator + reftable/generic: adapt interface to allow reuse of iterators + reftable/reader: adapt interface to allow reuse of iterators + reftable/stack: provide convenience functions to create iterators + reftable/merged: adapt interface to allow reuse of iterators + builtin/config: stop printing full usage on misuse + builtin/config: move legacy mode into its own function + builtin/config: move subcommand options into `cmd_config()` + builtin/config: move legacy options into `cmd_config()` + builtin/config: move actions into `cmd_config_actions()` + builtin/config: check for writeability after source is set up + config: make the config source const + builtin/config: refactor functions to have common exit paths + builtin/config: move location options into local variables + builtin/config: move display options into local variables + builtin/config: move type options into display options + builtin/config: move default value into display options + builtin/config: move `respect_includes_opt` into location options + builtin/config: convert `do_not_match` to a local variable + builtin/config: convert `value_pattern` to a local variable + builtin/config: convert `regexp` to a local variable + builtin/config: convert `key_regexp` to a local variable + builtin/config: convert `key` to a local variable + builtin/config: track "fixed value" option via flags only + builtin/config: convert flags to a local variable + builtin/config: pass data between callbacks via local variables + Documentation/glossary: redefine pseudorefs as special refs + Documentation/glossary: clarify limitations of pseudorefs + Documentation/glossary: define root refs as refs + refs: rename `is_pseudoref()` to `is_root_ref()` + refs: rename `is_special_ref()` to `is_pseudo_ref()` + refs: do not check ref existence in `is_root_ref()` + refs: classify HEAD as a root ref + refs: pseudorefs are no refs + ref-filter: properly distinuish pseudo and root refs + refs: refuse to write pseudorefs + completion: adapt git-config(1) to complete subcommands + refs: adjust names for `init` and `init_db` callbacks + refs: rename `init_db` callback to avoid confusion + refs: implement releasing ref storages + refs: track ref stores via strmap + refs: pass repo when retrieving submodule ref store + refs: refactor `resolve_gitlink_ref()` to accept a repository + refs: retrieve worktree ref stores via associated repository + refs: convert iteration over replace refs to accept ref store + refs: pass ref store when detecting dangling symrefs + refs: move object peeling into "object.c" + refs: pass repo when peeling objects + refs: drop `git_default_branch_name()` + refs: remove `dwim_log()` + refs/files: use correct repository + refs/files: remove references to `the_hash_algo` + refs/packed: remove references to `the_hash_algo` + builtin/patch-id: fix uninitialized hash function + builtin/hash-object: fix uninitialized hash function + setup: fix bug with "includeIf.onbranch" when initializing dir + ci: add missing dependency for TTY prereq + transport-helper: fix leaking helper name + t: mark a bunch of tests as leak-free + strbuf: fix leak when `appendwholeline()` fails with EOF + checkout: clarify memory ownership in `unique_tracking_name()` + http: refactor code to clarify memory ownership + config: clarify memory ownership in `git_config_pathname()` + diff: refactor code to clarify memory ownership of prefixes + convert: refactor code to clarify ownership of check_roundtrip_encoding + builtin/log: stop using globals for log config + builtin/log: stop using globals for format config + config: clarify memory ownership in `git_config_string()` + config: plug various memory leaks + builtin/credential: clear credential before exit + commit-reach: fix memory leak in `ahead_behind()` + submodule: fix leaking memory for submodule entries + strvec: add functions to replace and remove strings + builtin/mv: refactor `add_slash()` to always return allocated strings + builtin/mv duplicate string list memory + builtin/mv: refactor to use `struct strvec` + builtin/mv: fix leaks for submodule gitfile paths + Makefile: extract script to lint missing/extraneous manpages + Documentation/lint-manpages: bubble up errors + gitlab-ci: add job to run `make check-docs` + ci/test-documentation: work around SyntaxWarning in Python 3.12 + setup: unset ref storage when reinitializing repository version + refs: convert ref storage format to an enum + refs: pass storage format to `ref_store_init()` explicitly + refs: allow to skip creation of reflog entries + refs/files: refactor `add_pseudoref_and_head_entries()` + refs/files: extract function to iterate through root refs + refs/files: fix NULL pointer deref when releasing ref store + reftable: inline `merged_table_release()` + worktree: don't store main worktree twice + refs: implement removal of ref storages + refs: implement logic to migrate between ref storage formats + builtin/refs: new command to migrate ref storage formats + ci: fix check for Ubuntu 20.04 + global: improve const correctness when assigning string constants + global: convert intentionally-leaking config strings to consts + refs/reftable: stop micro-optimizing refname allocations on copy + reftable: cast away constness when assigning constants to records + refspec: remove global tag refspec structure + builtin/remote: cast away constness in `get_head_names()` + diff: cast string constant in `fill_textconv()` + line-log: stop assigning string constant to file parent buffer + line-log: always allocate the output prefix + entry: refactor how we remove items for delayed checkouts + ident: add casts for fallback name and GECOS + object-file: mark cached object buffers as const + object-file: make `buf` parameter of `index_mem()` a constant + pretty: add casts for decoration option pointers + compat/win32: fix const-correctness with string constants + http: do not assign string constant to non-const field + parse-options: cast long name for OPTION_ALIAS + send-pack: always allocate receive status + remote-curl: avoid assigning string constant to non-const variable + revision: always store allocated strings in output encoding + mailmap: always store allocated strings in mailmap blob + imap-send: drop global `imap_server_conf` variable + imap-send: fix leaking memory in `imap_server_conf` + builtin/rebase: do not assign default backend to non-constant field + builtin/rebase: always store allocated string in `options.strategy` + builtin/merge: always store allocated strings in `pull_twohead` + config.mak.dev: enable `-Wwrite-strings` warning + revision: fix memory leak when reversing revisions + parse-options: fix leaks for users of OPT_FILENAME + notes-utils: free note trees when releasing copied notes + bundle: plug leaks in `create_bundle()` + biultin/rev-parse: fix memory leaks in `--parseopt` mode + merge-recursive: fix leaking rename conflict info + revision: fix leaking display notes + notes: fix memory leak when pruning notes + builtin/rev-list: fix leaking bitmap index when calculating disk usage + object-name: free leaking object contexts + builtin/difftool: plug memory leaks in `run_dir_diff()` + builtin/merge-recursive: fix leaking object ID bases + merge-recursive: fix memory leak when finalizing merge + builtin/log: fix leaking commit list in git-cherry(1) + revision: free diff options + builtin/stash: fix leak in `show_stash()` + rerere: fix various trivial leaks + config: fix leaking "core.notesref" variable + commit: fix leaking parents when calling `commit_tree_extended()` + sequencer: fix leaking string buffer in `commit_staged_changes()` + apply: fix leaking string in `match_fragment()` + builtin/clone: plug leaking HEAD ref in `wanted_peer_refs()` + sequencer: fix memory leaks in `make_script_with_merges()` + builtin/merge: fix leaking `struct cmdnames` in `get_strategy()` + merge: fix leaking merge bases + line-range: plug leaking find functions + blame: fix leaking data for blame scoreboards + builtin/blame: fix leaking prefixed paths + builtin/blame: fix leaking ignore revs files + Makefile: add ability to append to CFLAGS and LDFLAGS + config: fix segfault when parsing "core.abbrev" without repo + parse-options-cb: stop clamping "--abbrev=" to hash length + object-name: don't try to abbreviate to lengths greater than hexsz + docs: introduce document to announce breaking changes + BreakingChanges: document upcoming change from "sha1" to "sha256" + BreakingChanges: document removal of grafting + BreakingChanges: document that we do not plan to deprecate git-checkout + hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions + hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()` + hash: require hash algorithm in `oidread()` and `oidclr()` + global: ensure that object IDs are always padded + hash: convert `oidcmp()` and `oideq()` to compare whole hash + hash: make `is_null_oid()` independent of `the_repository` + hash: require hash algorithm in `is_empty_{blob,tree}_oid()` + hash: require hash algorithm in `empty_tree_oid_hex()` + global: introduce `USE_THE_REPOSITORY_VARIABLE` macro + refs: avoid include cycle with "repository.h" + hash-ll: merge with "hash.h" + http-fetch: don't crash when parsing packfile without a repo + oidset: pass hash algorithm when parsing file + protocol-caps: use hash algorithm from passed-in repository + replace-object: use hash algorithm from passed-in repository + compat/fsmonitor: fix socket path in networked SHA256 repos + t/helper: use correct object hash in partial-clone helper + t/helper: fix segfault in "oid-array" command without repository + t/helper: remove dependency on `the_repository` in "proc-receive" + hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE` + +Peter Krefting (1): + git-gui: sv.po: Update Swedish translation (576t0f0u) + +Phillip Wood (7): + sequencer: always free "struct replay_opts" + sequencer: start removing private fields from public API + sequencer: move current fixups to private context + sequencer: store commit message in private context + rebase -m: fix --signoff with conflicts + rebase -i: pass struct replay_opts to parse_insn_line() + rebase -i: improve error message when picking merge + +Randall S. Becker (3): + version: --build-options reports OpenSSL version information + version: teach --build-options to reports libcurl version information + version: teach --build-options to reports zlib version information + +René Scharfe (10): + diff-lib: stop calling diff_setup_done() in do_diff_cache() + diff: report unmerged paths as changes in run_diff_cmd() + diff: fix --exit-code with external diff + difftool: add env vars directly in run_file_diff() + t4020: test exit code with external diffs + userdiff: add and use struct external_diff + diff: let external diffs report that changes are uninteresting + commit: remove find_header_mem() + diff: allow --color-moved with --no-ext-diff + submodule--helper: use strvec_pushf() for --super-prefix + +Roland Hieber (3): + completion: add 'symbolic-ref' + completion: improve docs for using __git_complete + completion: add docs on how to add subcommand completions + +Rubén Justo (5): + add-patch: do not show UI messages on stderr + add-patch: response to unknown command + t4014: cleanups in a few tests + format-patch: assume --cover-letter for diff in multi-patch series + pager: die when paging to non-existing command + +Shane Sun (1): + doc: fix case error of eol attribute in example + +Taylor Blau (62): + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf() + Makefile(s): avoid recipe prefix in conditional statements + object.h: add flags allocated by pack-bitmap.h + pack-bitmap-write.c: move commit_positions into commit_pos fields + pack-bitmap: avoid use of static `bitmap_writer` + pack-bitmap: drop unused `max_bitmaps` parameter + pack-bitmap-write.c: avoid uninitialized 'write_as' field + pack-bitmap: introduce `bitmap_writer_free()` + Documentation/gitpacking.txt: initial commit + Documentation/gitpacking.txt: describe pseudo-merge bitmaps + Documentation/technical: describe pseudo-merge bitmaps format + ewah: implement `ewah_bitmap_is_subset()` + pack-bitmap: move some initialization to `bitmap_writer_init()` + pseudo-merge.ch: initial commit + pack-bitmap-write: support storing pseudo-merge commits + pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()` + pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public + config: introduce `git_config_double()` + pseudo-merge: implement support for selecting pseudo-merge commits + pack-bitmap-write.c: write pseudo-merge table + pack-bitmap: extract `read_bitmap()` function + pseudo-merge: scaffolding for reads + pack-bitmap.c: read pseudo-merge extension + pseudo-merge: implement support for reading pseudo-merge commits + ewah: implement `ewah_bitmap_popcount()` + pack-bitmap: implement test helpers for pseudo-merge + t/test-lib-functions.sh: support `--notick` in `test_commit_bulk()` + pack-bitmap.c: use pseudo-merges during traversal + pack-bitmap: extra trace2 information + ewah: `bitmap_equals_ewah()` + pseudo-merge: implement support for finding existing merges + t/perf: implement performance tests for pseudo-merge bitmaps + midx-write.c: tolerate `--preferred-pack` without bitmaps + midx-write.c: reduce argument count for `get_sorted_entries()` + midx-write.c: pass `start_pack` to `compute_sorted_entries()` + midx-write.c: extract `should_include_pack()` + midx-write.c: extract `fill_packs_from_midx()` + midx-write.c: support reading an existing MIDX with `packs_to_include` + midx: replace `get_midx_rev_filename()` with a generic helper + pack-bitmap.c: reimplement `midx_bitmap_filename()` with helper + commit-graph.c: remove temporary graph layers on exit + server-info.c: remove temporary info files on exit + midx-write.c: do not read existing MIDX with `packs_to_include` + pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse + pack-revindex.c: guard against out-of-bounds pack lookups + Documentation/technical/bitmap-format.txt: add missing position table + pack-bitmap.c: ensure pseudo-merge offset reads are bounded + t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()` + revision.c: consult Bloom filters for root commits + commit-graph: ensure Bloom filters are read with consistent settings + t/helper/test-read-graph.c: extract `dump_graph_info()` + bloom.h: make `load_bloom_filter_from_graph()` public + t/helper/test-read-graph: implement `bloom-filters` mode + t4216: test changed path filters with high bit paths + repo-settings: introduce commitgraph.changedPathsVersion + bloom: annotate filters with hash version + bloom: prepare to discard incompatible Bloom filters + commit-graph: unconditionally load Bloom filters + commit-graph: new Bloom filter version that fixes murmur3 + object.h: fix mis-aligned flag bits table + commit-graph: reuse existing Bloom filters where possible + bloom: introduce `deinit_bloom_filters()` + +Tom Hughes (2): + push: don't fetch commit object when checking existence + promisor-remote: add promisor.quiet configuration option + +Torsten Bögershausen (1): + macOS: ls-files path fails if path of workdir is NFD + +Victoria Dye (1): + Documentation/git-merge-tree.txt: document -X + +Xing Xin (4): + midx: disable replace objects + bundle-uri: verify oid before writing refs + fetch-pack: expose fsckObjects configuration logic + unbundle: extend object verification for fetches + +brian m. carlson (19): + credential: add an authtype field + remote-curl: reset headers on new request + http: use new headers for each object request + credential: add a field for pre-encoded credentials + credential: gate new fields on capability + credential: add a field called "ephemeral" + docs: indicate new credential protocol fields + http: add support for authtype and credential + credential: add an argument to keep state + credential: enable state capability + docs: set a limit on credential line length + t5563: refactor for multi-stage authentication + credential: add support for multistage credential rounds + t: add credential tests for authtype + credential-cache: implement authtype capability + credential: add method for querying capabilities + t4046: avoid continue in &&-chain for zsh + vimdiff: make script and tests work with zsh + git-gui: po: fix typo in French "aperçu" + +Øystein Walle (1): + Documentation: Mention that refspecs are explained elsewhere + + +Version v2.45.2; changes since v2.45.1: +--------------------------------------- + +Jeff King (5): + send-email: drop FakeTerm hack + send-email: avoid creating more than one Term::ReadLine object + ci: drop mention of BREW_INSTALL_PACKAGES variable + ci: avoid bare "gcc" for osx-gcc job + ci: stop installing "gcc-13" for osx-gcc + +Johannes Schindelin (6): + hook: plug a new memory leak + init: use the correct path of the templates directory again + Revert "core.hooksPath: add some protection while cloning" + tests: verify that `clone -c core.hooksPath=/dev/null` works again + clone: drop the protections where hooks aren't run + Revert "Add a helper function to compare file contents" + +Junio C Hamano (2): + Revert "fsck: warn about symlink pointing inside a gitdir" + Git 2.39.5 + + +Version v2.45.1; changes since v2.45.0: +--------------------------------------- + +Filip Hejsek (4): + t0411: add tests for cloning from partial repo + has_dir_name(): do not get confused by characters < '/' + t7423: add tests for symlinked submodule directories + clone: prevent clashing git dirs when cloning submodule in parallel + +Jeff King (6): + http: reset POSTFIELDSIZE when clearing curl handle + INSTALL: bump libcurl version to 7.21.3 + remote-curl: add Transfer-Encoding header only for older curl + test-lib: ignore uninteresting LSan output + upload-pack: disable lazy-fetching by default + docs: document security issues around untrusted .git dirs + +Johannes Schindelin (26): + repository: avoid leaking `fsmonitor` data + ci: upgrade to using macos-13 + ci(linux-asan/linux-ubsan): let's save some time + ci: bump remaining outdated Actions versions + ci(linux32): add a note about Actions that must not be updated + fetch/clone: detect dubious ownership of local repositories + submodules: submodule paths must not contain symlinks + clone_submodule: avoid using `access()` on directories + submodule: require the submodule path to contain directories only + t5510: verify that D/F confusion cannot lead to an RCE + entry: report more colliding paths + clone: when symbolic links collide with directories, keep the latter + find_hook(): refactor the `STRIP_EXTENSION` logic + init: refactor the template directory discovery into its own function + Add a helper function to compare file contents + clone: prevent hooks from running during a clone + init.templateDir: consider this config setting protected + core.hooksPath: add some protection while cloning + fsck: warn about symlink pointing inside a gitdir + Git 2.39.4 + Git 2.40.2 + Git 2.41.1 + Git 2.42.2 + Git 2.43.4 + Git 2.44.1 + Git 2.45.1 + +Junio C Hamano (2): + GitHub Actions: update to checkout@v4 + GitHub Actions: update to github-script@v7 + +Patrick Steinhardt (4): + builtin/clone: stop resolving symlinks when copying files + builtin/clone: abort when hardlinked source and target file differ + setup.c: introduce `die_upon_dubious_ownership()` + builtin/clone: refuse local clones of unsafe repositories + + +Version v2.45.0; changes since v2.45.0-rc1: +------------------------------------------- + +Alexander Shopov (1): + l10n: bg.po: Updated Bulgarian translation (5652t) + +Arkadii Yakovets (1): + l10n: uk: v2.45 update + +Bagas Sanjaya (1): + l10n: po-id for 2.45 + +Emir SARI (1): + l10n: tr: Update Turkish translations + +Jean-Noël Avila (1): + l10n: fr: v2.45.0 + +Jiang Xin (1): + l10n: TEAMS: retire l10n teams no update in 1 year + +Junio C Hamano (1): + Git 2.45 + +Peter Krefting (1): + l10n: sv.po: Update Swedish translation + +Ralf Thielow (1): + l10n: Update German translation + +René Scharfe (1): + don't report vsnprintf(3) error as bug + +Rubén Justo (4): + apply: plug a leak in apply_data + add-interactive: plug a leak in get_untracked_files + add-patch: plug a leak handling the '/' command + add: plug a leak on interactive_add + +Taylor Blau (1): + Documentation/RelNotes/2.45.0.txt: fix typo + +Teng Long (1): + l10n: zh_CN: for git 2.45 rounds + +Vũ Tiến Hưng (2): + l10n: Update Vietnamese team contact + l10n: vi: Updated translation for 2.45 + +Yi-Jyun Pan (1): + l10n: zh-TW: Git 2.45 + + +Version v2.45.0-rc1; changes since v2.45.0-rc0: +----------------------------------------------- + +Junio C Hamano (2): + A bit more topics before -rc1 + Git 2.45-rc1 + +Linus Arver (5): + format_trailer_info(): use trailer_item objects + format_trailer_info(): drop redundant unfold_value() + format_trailer_info(): append newline for non-trailer lines + trailer: begin formatting unification + trailer: finish formatting unification + +Marcel Röthke (1): + rerere: fix crashes due to unmatched opening conflict markers + +Orgad Shaneh (1): + docs: remove duplicate entry and fix typo in 2.45 changelog + +Patrick Steinhardt (15): + reftable/block: rename `block_reader_start()` + reftable/block: merge `block_iter_seek()` and `block_reader_seek()` + reftable/block: better grouping of functions + reftable/block: introduce `block_reader_release()` + reftable/block: move ownership of block reader into `struct table_iter` + reftable/reader: iterate to next block in place + reftable/block: reuse uncompressed blocks + reftable/block: open-code call to `uncompress2()` + reftable/block: reuse `zstream` state on inflation + reftable/block: avoid copying block iterators on seek + pack-bitmap: gracefully handle missing BTMP chunks + run-command: introduce function to prepare auto-maintenance process + builtin/receive-pack: convert to use git-maintenance(1) + docs: improve changelog entry for `git pack-refs --auto` + docs: address typos in Git v2.45 changelog + +Peter Krefting (1): + bisect: report the found commit with "show" + +René Scharfe (3): + git-compat-util: fix NO_OPENSSL on current macOS + imap-send: increase command size limit + apply: avoid using fixed-size buffer in write_out_one_reject() + +Rubén Justo (1): + launch_editor: waiting message on error + +Thalia Archibald (8): + fast-import: tighten path unquoting + fast-import: directly use strbufs for paths + fast-import: allow unquoted empty path for root + fast-import: remove dead strbuf + fast-import: improve documentation for path quoting + fast-import: document C-style escapes for paths + fast-import: forbid escaped NUL in paths + fast-import: make comments more precise + +Xing Xin (1): + Documentation: fix typos describing date format + +Yehezkel Bernat (1): + Documentation: fix linkgit reference + +Đoàn Trần Công Danh (1): + t9604: Fix test for musl libc and new Debian + + +Version v2.45.0-rc0; changes since v2.44.2: +------------------------------------------- + +Ahelenia Ziemiańska (1): + grep: improve errors for unmatched ( and ) + +Alexander Shopov (4): + transport-helper.c: trivial fix of error message + builtin/remote.c: trivial fix of error message + builtin/clone.c: trivial fix of message + revision.c: trivial fix to message + +Aryan Gupta (1): + tests: modernize the test script t0010-racy-git.sh + +Beat Bolli (25): + completion: use awk for filtering the config entries + date: make "iso-strict" conforming for the UTC timezone + t0006: add more tests with a negative TZ offset + doc: avoid redundant use of cat + contrib/subtree/t: avoid redundant use of cat + t/lib-cvs.sh: avoid redundant use of cat + t/annotate-tests.sh: avoid redundant use of cat + t/perf: avoid redundant use of cat + t/t0*: avoid redundant uses of cat + t/t1*: avoid redundant uses of cat + t/t3*: avoid redundant uses of cat + t/t4*: avoid redundant uses of cat + t/t5*: avoid redundant uses of cat + t/t6*: avoid redundant uses of cat + t/t7*: avoid redundant use of cat + t/t8*: avoid redundant use of cat + t/t9*: avoid redundant uses of cat + t/t1*: merge a "grep | sed" pipeline + t/t3*: merge a "grep | awk" pipeline + t/t4*: merge a "grep | sed" pipeline + t/t5*: merge a "grep | sed" pipeline + t/t8*: merge "grep | sed" pipelines + t/t9*: merge "grep | sed" pipelines + contrib/coverage-diff: avoid redundant pipelines + git-quiltimport: avoid an unnecessary subshell + +Bo Anderson (5): + t/lib-credential: clean additional credential + osxkeychain: replace deprecated SecKeychain API + osxkeychain: erase all matching credentials + osxkeychain: erase matching passwords only + osxkeychain: store new attributes + +Brian C Tracy (1): + fuzz: add fuzzer for config parsing + +Brian Lyles (13): + docs: clarify file options in git-config `--edit` + docs: fix typo in git-config `--default` + docs: correct trailer `key_value_separator` description + docs: adjust trailer `separator` and `key_value_separator` language + pretty: update tests to use `test_config` + pretty: find pretty formats case-insensitively + docs: address inaccurate `--empty` default with `--exec` + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) + rebase: update `--empty=ask` to `--empty=stop` + sequencer: handle unborn branch with `--allow-empty` + sequencer: do not require `allow_empty` for redundant commit options + cherry-pick: enforce `--keep-redundant-commits` incompatibility + cherry-pick: add `--empty` for more robust redundant commit handling + +Chandra Pratap (2): + apply: ignore working tree filemode when !core.filemode + t9146: replace test -d/-e/-f with appropriate test_path_is_* function + +Christian Couder (5): + revision: clarify a 'return NULL' in get_reference() + oidset: refactor oidset_insert_from_set() + t6022: fix 'test' style and 'even though' typo + rev-list: allow missing tips with --missing=[print|allow*] + revision: fix --missing=[print|allow*] for annotated tags + +Derrick Stolee (1): + fetch: return when parsing submodule.recurse + +Dirk Gouders (6): + Documentation/user-manual.txt: example for generating object hashes + MyFirstObjectWalk: use additional arg in config_fn_t + MyFirstObjectWalk: fix misspelled "builtins/" + MyFirstObjectWalk: fix filtered object walk + MyFirstObjectWalk: fix description for counting omitted objects + MyFirstObjectWalk: add stderr to pipe processing + +Dragan Simic (8): + documentation: send-email: use camel case consistently + config: minor addition of whitespace + config: really keep value-internal whitespace verbatim + t1300: add more tests for whitespace and inline comments + config.txt: describe handling of whitespace further + grep docs: describe --recurse-submodules further and improve formatting a bit + grep docs: describe --no-index further and improve formatting a bit + config: fix some small capitalization issues, as spotted + +Eric Sunshine (2): + docs: sort configuration variable groupings alphabetically + test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback + +Eric W. Biederman (23): + object-file-convert: stubs for converting from one object format to another + oid-array: teach oid-array to handle multiple kinds of oids + object-names: support input of oids in any supported hash + repository: add a compatibility hash algorithm + loose: compatibilty short name support + object-file: update the loose object map when writing loose objects + object-file: add a compat_oid_in parameter to write_object_file_flags + commit: convert mergetag before computing the signature of a commit + commit: export add_header_signature to support handling signatures on tags + tag: sign both hashes + object: factor out parse_mode out of fast-import and tree-walk into in object.h + object-file-convert: don't leak when converting tag objects + object-file-convert: convert commits that embed signed tags + object-file: update object_info_extended to reencode objects + rev-parse: add an --output-object-format parameter + builtin/cat-file: let the oid determine the output algorithm + tree-walk: init_tree_desc take an oid to get the hash algorithm + object-file: handle compat objects in check_object_signature + builtin/ls-tree: let the oid determine the output algorithm + test-lib: compute the compatibility hash so tests may use it + t1006: rename sha1 to oid + t1006: test oid compatibility with cat-file + t1016-compatObjectFormat: add tests to verify the conversion between objects + +Eugenio Gigante (1): + add: use unsigned type for collection of bits + +Florian Schmidt (1): + wt-status: don't find scissors line beyond buf len + +Ghanshyam Thakkar (5): + add-patch: classify '@' as a synonym for 'HEAD' + add -p tests: remove PERL prerequisites + setup: remove unnecessary variable + builtin/commit: error out when passing untracked path with -i + builtin/add: error out when passing untracked path with -u + +Haritha D (1): + build: support z/OS (OS/390). + +Harmen Stoppels (1): + rebase: make warning less passive aggressive + +Jakub Wilk (1): + git-remote.txt: fix typo + +Jean-Noël Avila (17): + doc: git-rev-parse: enforce command-line description syntax + doc: close unclosed angle-bracket of a placeholder in git-clone doc + doc: end sentences with full-stop + doc: clarify the format of placeholders + doc: git-init: format verbatim parts + doc: git-init: format placeholders + doc: git-init: rework definition lists + doc: git-init: rework config item init.templateDir + doc: git-clone: format verbatim words + doc: git-clone: format placeholders + doc: format alternatives in synopsis + doc: fix some placeholders formating + doc: rework CodingGuidelines with new formatting rules + doc: allow literal and emphasis format in doc vs help tests + doc: git-init: apply new documentation formatting guidelines + doc: git-clone: apply new documentation formatting guidelines + doc: git-clone: do not autoreference the manpage in itself + +Jeff Hostetler (17): + name-hash: add index_dir_find() + t7527: add case-insensitve test for FSMonitor + fsmonitor: refactor refresh callback on directory events + fsmonitor: clarify handling of directory events in callback helper + fsmonitor: refactor refresh callback for non-directory events + dir: create untracked_cache_invalidate_trimmed_path() + fsmonitor: refactor untracked-cache invalidation + fsmonitor: move untracked-cache invalidation into helper functions + fsmonitor: return invalidated cache-entry count on directory event + fsmonitor: remove custom loop from non-directory path handler + fsmonitor: return invalidated cache-entry count on non-directory event + fsmonitor: trace the new invalidated cache-entry count + fsmonitor: refactor bit invalidation in refresh callback + fsmonitor: support case-insensitive events + t0211: demonstrate missing 'def_param' events for certain commands + trace2: avoid emitting 'def_param' set more than once + trace2: emit 'def_param' set with 'cmd_name' event + +Jeff King (51): + t0303: check that helper_test_clean removes all credentials + userdiff: skip textconv caching when not in a repository + Revert "refs: allow @{n} to work with n-sized reflog" + get_oid_basic(): special-case ref@{n} for oldest reflog entry + read_ref_at(): special-case ref@{0} for an empty reflog + upload-pack: drop separate v2 "haves" array + upload-pack: switch deepen-not list to an oid_array + upload-pack: use oidset for deepen_not list + upload-pack: use a strmap for want-ref lines + upload-pack: accept only a single packfile-uri line + upload-pack: always turn off save_commit_buffer + upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more places + upload-pack: free tree buffers after parsing + upload-pack: use repository struct to get config + upload-pack: centralize setup of sideband-all config + upload-pack: use existing config mechanism for advertisement + upload-pack: only accept packfile-uris if we advertised it + doc/gitremote-helpers: fix missing single-quote + config: forbid newline as core.commentChar + strbuf: simplify comment-handling in add_lines() helper + strbuf: avoid static variables in strbuf_add_commented_lines() + commit: refactor base-case of adjust_comment_line_char() + strbuf: avoid shadowing global comment_line_char name + environment: store comment_line_char as a string + strbuf: accept a comment string for strbuf_stripspace() + strbuf: accept a comment string for strbuf_commented_addf() + strbuf: accept a comment string for strbuf_add_commented_lines() + prefer comment_line_str to comment_line_char for printing + find multi-byte comment chars in NUL-terminated strings + find multi-byte comment chars in unterminated buffers + sequencer: handle multi-byte comment characters when writing todo list + wt-status: drop custom comment-char stringification + environment: drop comment_line_char compatibility macro + config: allow multi-byte core.commentChar + shortlog: stop setting pp.print_email_subject + pretty: split oneline and email subject printing + pretty: drop print_email_subject flag + log: do not set up extra_headers for non-email formats + format-patch: return an allocated string from log_write_email_headers() + format-patch: simplify after-subject MIME header handling + doc/gitremote-helpers: fix more missing single-quotes + transport-helper: use write helpers more consistently + transport-helper: drop "object-format " option + transport-helper: send "true" value for object-format option + contrib: drop hg-to-git script + format-patch: fix leak of empty header string + rebase: use child_process_clear() to clean + config: add core.commentString + http: reset POSTFIELDSIZE when clearing curl handle + INSTALL: bump libcurl version to 7.21.3 + remote-curl: add Transfer-Encoding header only for older curl + +Jiamu Sun (1): + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option + +Johannes Schindelin (22): + merge-tree: accept 3 trees as arguments + merge-tree: fail with a non-zero exit code on missing tree objects + merge-ort: do check `parse_tree()`'s return value + t4301: verify that merge-tree fails on missing blob objects + Always check `parse_tree*()`'s return value + cache-tree: avoid an unnecessary check + fill_tree_descriptor(): mark error message for translation + neue: remove a bogus empty file + commit-reach(paint_down_to_common): plug two memory leaks + commit-reach(repo_in_merge_bases_many): optionally expect missing commits + commit-reach(repo_in_merge_bases_many): report missing commits + commit-reach(paint_down_to_common): prepare for handling shallow commits + commit-reach(paint_down_to_common): start reporting errors + commit-reach(merge_bases_many): pass on "missing commits" errors + commit-reach(get_merge_bases_many_0): pass on "missing commits" errors + commit-reach(repo_get_merge_bases): pass on "missing commits" errors + commit-reach(get_octopus_merge_bases): pass on "missing commits" errors + commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors + commit-reach(repo_get_merge_bases_many_dirty): pass on errors + merge-recursive: prepare for `merge_submodule()` to report errors + merge-ort/merge-recursive: do report errors in `merge_submodule()` + merge-tree: fix argument type of the `--merge-base` option + +John Cai (1): + t5300: fix test_with_bad_commit() + +Jonas Wunderlich (1): + doc: status.showUntrackedFiles does not take "false" + +Josh Triplett (2): + commit: avoid redundant scissor line with --cleanup=scissors -v + commit: unify logic to avoid multiple scissors lines when merging + +Julio Bacellari (1): + doc: remove outdated information about interactive.singleKey + +Junio C Hamano (61): + apply: correctly reverse patch's pre- and post-image mode bits + apply: code simplification + t9210: do not rely on lazy fetching to fail + git: --no-lazy-fetch option + doc: add shortcut to "am --whitespace=" + doc: apply the new placeholder rules to git-add documentation + compat: drop inclusion of + Start the 2.45 cycle + git: document GIT_NO_REPLACE_OBJECTS environment variable + doc: clarify the wording on requirement + git: extend --no-lazy-fetch to work across subprocesses + The second batch + The third batch + test_i18ngrep: hard deprecate and forbid its use + unpack: replace xwrite() loop with write_in_full() + sideband: avoid short write(2) + repack: check error writing to pack-objects subprocess + clean: further clean-up of implementation around "--force" + The fourth batch + The fifth batch + setup: notice more types of implicit bare repositories + The sixth batch + status: unify parsing of --untracked= and status.showUntrackedFiles + status: allow --untracked=false and friends + The seventh batch + The eighth batch + config: fix --comment formatting + config: allow tweaking whitespace between value and comment + diff.*Prefix: use camelCase in the doc and test titles + The ninth batch + apply: parse names out of "diff --git" more carefully + The tenth batch + The eleventh batch + SubmittingPatches: release-notes entry experiment + The twelfth batch + t4126: make sure a directory with SP at the end is usable + t4126: fix "funny directory name" test on Windows (again) + advice: omit trailing whitespace + checkout: omit "tracking" information on a detached HEAD + The thirteenth batch + t2104: style fixes + The fourteenth batch + revision: optionally record matches with pathspec elements + The fifteenth batch + CodingGuidelines: describe "export VAR=VAL" rule + CodingGuidelines: quote assigned value in 'local var=$val' + t: local VAR="VAL" (quote positional parameters) + t: local VAR="VAL" (quote command substitution) + t: local VAR="VAL" (quote ${magic-reference}) + t: teach lint that RHS of 'local VAR=VAL' needs to be quoted + t0610: local VAR="VAL" fix + t1016: local VAR="VAL" fix + config: do not leak excludes_file + Makefile(s): do not enforce "all indents must be done with tab" + The sixteenth batch + t2104: style fixes + The seventeenth batch + The eighteenth batch + The ninteenth batch + The twentieth batch + Git 2.45-rc0 + +Justin Tobler (3): + reftable/stack: expose option to disable auto-compaction + reftable/stack: add env to disable autocompaction + reftable/stack: use geometric table compaction + +Karthik Nayak (7): + refs: introduce `is_pseudoref()` and `is_headref()` + refs: extract out `loose_fill_ref_dir_regular_file()` + refs: introduce `refs_for_each_include_root_refs()` + ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR' + for-each-ref: add new option to include root refs + update-ref: use {old,new}-oid instead of {old,new}value + githooks: use {old,new}-oid instead of {old,new}-value + +Kipras Melnikovas (1): + mergetools: vimdiff: use correct tool's name when reading mergetool config + +Kristoffer Haugsbakk (9): + column: disallow negative padding + column: guard against negative padding + gitcli: drop mention of “non-dashed form” + config: document `core.commentChar` as ASCII-only + t3200: improve test style + advice: make all entries stylistically consistent + advice: use backticks for verbatim + advice: use double quotes for regular quoting + branch: advise about ref syntax rules + +Linus Arver (10): + trailer: free trailer_info _after_ all related usage + shortlog: add test for de-duplicating folded trailers + trailer: rename functions to use 'trailer' + trailer: reorder format_trailers_from_commit() parameters + trailer: move interpret_trailers() to interpret-trailers.c + trailer_info_get(): reorder parameters + format_trailers(): use strbuf instead of FILE + format_trailer_info(): move "fast path" to caller + format_trailers_from_commit(): indirectly call trailer_info_get() + mailmap: change primary address for Linus Arver + +M Hickford (1): + libsecret: retrieve empty password + +Matthias Aßhauer (1): + Win32: detect unix socket support at runtime + +Max Gautier (1): + editorconfig: add Makefiles to "text files" + +Michael Lohmann (2): + revision: ensure MERGE_HEAD is a ref in prepare_show_merge + revision: implement `git log --merge` also for rebase/cherry-pick/revert + +Patrick Steinhardt (84): + refs: introduce reftable backend + ci: add jobs to test with the reftable backend + refs/reftable: fix leak when copying reflog fails + reftable/record: introduce function to compare records by key + reftable/merged: allocation-less dropping of shadowed records + reftable/merged: skip comparison for records of the same subiter + reftable/pq: allocation-less comparison of entry keys + reftable/block: swap buffers instead of copying + reftable/record: don't try to reallocate ref record name + reftable/reader: add comments to `table_iter_next()` + t: move tests exercising the "files" backend + t0410: convert tests to use DEFAULT_REPO_FORMAT prereq + t1400: exercise reflog with gaps with reftable backend + t1404: make D/F conflict tests compatible with reftable backend + t1405: remove unneeded cleanup step + t2011: exercise D/F conflicts with HEAD with the reftable backend + t7003: ensure filter-branch prunes reflogs with the reftable backend + git-difftool--helper: honor `--trust-exit-code` with `--dir-diff` + dir-iterator: pass name to `prepare_next_entry_data()` directly + dir-iterator: support iteration in sorted order + refs/files: sort reflogs returned by the reflog iterator + refs/files: sort merged worktree and common reflogs + refs: always treat iterators as ordered + refs: drop unused params from the reflog iterator callback + refs: stop resolving ref corresponding to reflogs + builtin/reflog: introduce subcommand to list reflogs + builtin/clone: allow remote helpers to detect repo + refs/reftable: don't fail empty transactions in repo without HEAD + reftable/pq: use `size_t` to track iterator index + reftable/merged: make `merged_iter` structure private + reftable/merged: advance subiter on subsequent iteration + reftable/merged: make subiters own their records + reftable/merged: remove unnecessary null check for subiters + reftable/merged: handle subiter cleanup on close only + reftable/merged: circumvent pqueue with single subiter + reftable/merged: avoid duplicate pqueue emptiness check + reftable/record: reuse refname when decoding + reftable/record: reuse refname when copying + reftable/record: decode keys in place + reftable: allow inlining of a few functions + refs/reftable: precompute prefix length + refs/reftable: reload correct stack when creating reflog iter + reftable/record: convert old and new object IDs to arrays + reftable/record: avoid copying author info + reftable/record: reuse refnames when decoding log records + reftable/record: reuse message when decoding log records + reftable/record: use scratch buffer when decoding records + refs/reftable: track last log record name via strbuf + t0610: remove unused variable assignment + lockfile: report when rollback fails + reftable/stack: register new tables as tempfiles + reftable/stack: register lockfiles during compaction + reftable/stack: register compacted tables as tempfiles + reftable/record: fix memory leak when decoding object records + reftable/block: fix binary search over restart counter + t5601: exercise clones with "includeIf.*.onbranch" + reftable: fix tests being broken by NFS' delete-after-close semantics + t7800: improve test descriptions with empty arguments + t7800: use single quotes for test bodies + t/README: document how to loop around test cases + reftable/stack: fix error handling in `reftable_stack_init_addition()` + reftable/error: discern locked/outdated errors + reftable/stack: use error codes when locking fails during compaction + reftable/stack: gracefully handle failed auto-compaction due to locks + refs/reftable: print errors on compaction failure + t/helper: drop pack-refs wrapper + refs: move `struct pack_refs_opts` to where it's used + refs: remove `PACK_REFS_ALL` flag + refs/reftable: expose auto compaction via new flag + builtin/pack-refs: release allocated memory + builtin/pack-refs: introduce new "--auto" flag + builtin/gc: move `struct maintenance_run_opts` + t6500: extract objects with "17" prefix + builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs + builtin/gc: pack refs when using `git maintenance run --auto` + reftable/basics: fix return type of `binsearch()` to be `size_t` + reftable/basics: improve `binsearch()` test + reftable/refname: refactor binary search over refnames + reftable/block: refactor binary search over restart points + reftable/block: fix error handling when searching restart points + reftable/record: extract function to decode key lengths + reftable/block: avoid decoding keys when searching restart points + t0610: make `--shared=` tests reusable + t0610: execute git-pack-refs(1) with specified umask + +Peter Hutterer (1): + diff: add diff.srcPrefix and diff.dstPrefix configuration variables + +Philippe Blain (5): + merge-ort: turn submodule conflict suggestions into an advice + ci(github): make Windows test artifacts name unique + sequencer: allow disabling conflict advice + builtin/am: allow disabling conflict advice + t/README: mention test files are make targets + +Phillip Wood (9): + rebase -i: stop setting GIT_CHERRY_PICK_HELP + xdiff-interface: refactor parsing of merge.conflictstyle + merge-ll: introduce LL_MERGE_OPTIONS_INIT + merge options: add a conflict style member + checkout: cleanup --conflict=