Grant MoyerandMichele Locati
4811dabed7
The "--state-branch" option asks git-filter-branch(1) to write a mapping from old to new objects into a branch to enable incremental processing of large histories. This object mapping is stored as a simple blob at "$state_branch:filter.map" with one object pair per line in the format "$from_commit:$to_commit". Before processing commits in a subsequent run, the state branch is used to populate an object mapping directory, where each file is named "map/$from_commit" and has contents "$to_commit". Inf6d855091e(filter-branch: stop depending on Perl, 2025-04-16), we refactored git-filter-branch(1) to no longer require Perl, but accidentally started to interpret object pairs in reverse (as "$to_commit:$from_commit") when populating the map directory from the state branch. This can cause all kinds of bad behavior from the state-branch being effectively ignored to previously filtered objects accidentally being mapped back to unfiltered objects. One especially evident case occurs when "git filter-branch --prune-empty ..." maps some commits to nothing, then on subsequent runs outputs many errors while trying to create files with empty names, like: > /usr/lib/git-core/git-filter-branch: line 305: ../map/: Is a directory This regression went unnoticed because, since the introduction of the only test for "--state-branch" in709cfe848a(filter-branch: skip commits present on --state-branch, 2018-06-26), the test accidentally passes even if commits are not skipped. The test checks that after populating a state branch with git-filter-branch(1), then running it again with that state branch, the resulting filtered commits for the first run and second run match. However since the filter used is deterministic, the commits always match, even if the commits in the state branch are re-filtered. Fix the population of the object mapping dir by interpreting object pairs as "$from_commit:$to_commit". Also fix the existing "--state-branch" test by directly exiting with a non-zero code if any commits from the state branch aren't skipped. Finally, add a new "--state-branch" test which directly checks that a commit from the state branch is used when incrementally filtering a repo. Tested-by: Michele Locati <michele@locati.it> Co-authored-by: Michele Locati <michele@locati.it> Signed-off-by: Michele Locati <michele@locati.it> Signed-off-by: Grant Moyer <dev@grantmoyer.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git - fast, scalable, distributed revision control system
Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.
Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.
Please read the file INSTALL for installation instructions.
Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.
See Documentation/gittutorial.adoc to get started, then see
Documentation/giteveryday.adoc for a useful minimum set of commands, and
Documentation/git-<commandname>.adoc for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with man gittutorial or git help tutorial, and the
documentation of each command with man git-<commandname> or git help <commandname>.
CVS users may also want to read Documentation/gitcvs-migration.adoc
(man gitcvs-migration or git help cvs-migration if git is
installed).
The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).
Those wishing to help with error message, usage and informational message
string translations (localization l10) should see po/README.md
(a po file is a Portable Object file that holds the translations).
To subscribe to the list, send an email to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://marc.info/?l=git and other archival sites.
Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.
The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.
The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):
- random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
- stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
- "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
- "goddamn idiotic truckload of sh*t": when it breaks