Skip to content
Snippets Groups Projects
Select Git revision
  • cc-lop-filter25
  • b4/505-wire-up-sparse-via-meson
  • cc-lop-filter24
  • cc-lop-filter23
  • cc-lop-filter22
  • b4/pks-split-object-file
  • b4/pks-drop-perl
  • cc-lop-filter21
  • cc-lop-filter20
  • cc-lop-filter19
  • cc-lop-filter18
  • cc-lop-filter17
  • cc-lop-filter16
  • cc-lop-filter15
  • cc-lop-filter14
  • cc-lop-filter13
  • cc-lop-filter12
  • cc-lop-filter11
  • cc-lop-filter10
  • todo protected
  • v2.49.0.gl1 protected
  • v2.49.0 protected
  • v2.49.0-rc2 protected
  • v2.49.0-rc1 protected
  • v2.49.0-rc0 protected
  • v2.48.1.gl1 protected
  • v2.48.1 protected
  • v2.48.0 protected
  • v2.48.0-rc2 protected
  • v2.48.0-rc1 protected
  • v2.46.3 protected
  • v2.40.4 protected
  • v2.41.3 protected
  • v2.42.4 protected
  • v2.43.6 protected
  • v2.44.3 protected
  • v2.45.3 protected
  • v2.47.2 protected
  • v2.48.0-rc0 protected
  • v2.47.1 protected
40 results

git

  • Clone with SSH
  • Clone with HTTPS
  • Johannes Schindelin's avatar
    Johannes Schindelin authored
    There is a bug in the way renames are cached that rears its head when
    `merge.directoryRenames` is set to false; it results in the following
    message:
    
        merge-ort.c:3002: process_renames: Assertion `newinfo && !newinfo->merged.clean' failed.
        Aborted
    
    It is quite a curious bug: the same test case will succeed, without any
    assertion, if instead run with `merge.directoryRenames=true`.
    
    Further, the assertion does not manifest while replaying the first
    commit, it manifests while replaying the _second_ commit of the commit
    range. But it does _not_ manifest when the second commit is replayed
    individually.
    
    This would indicate that there is an incomplete rename cache left-over
    from the first replayed commit which is being reused for the second
    commit, and if directory rename detection is enabled, the missing paths
    are somehow regenerated.
    
    Incidentally, the same bug can by triggered by modifying t6429 to switch
    from merge.directoryRenames=true to merge.directoryRenames=false.
    
    Signed-off-by: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
    [en: tweaked the commit message slightly, including adjusting the
     line number of the assertion to the latest version, and the much
     later discovery that a simple t6429 tweak would also display the
     issue.]
    Signed-off-by: default avatarElijah Newren <newren@gmail.com>
    Reviewed-by: default avatarTaylor Blau <me@ttaylorr.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    a9185cc8
    History

    Build status

    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