Johannes Schindelin 2ee045eea1 commit -a -m: allow the top-level tree to become empty again
In 03267e8656c (commit: discard partial cache before (re-)reading it,
2022-11-08), a memory leak was plugged by discarding any partial index
before re-reading it.

The problem with this memory leak fix is that it was based on an
incomplete understanding of the logic introduced in 7168624c353 (Do not
generate full commit log message if it is not going to be used,
2007-11-28).

That logic was introduced to add a shortcut when committing without
editing the commit message interactively. A part of that logic was to
ensure that the index was read into memory:

	if (!active_nr && read_cache() < 0)
		die(...)

Translation to English: If the index has not yet been read, read it, and
if that fails, error out.

That logic was incorrect, though: It used `!active_nr` as an indicator
that the index was not yet read. Usually this is not a problem because
in the vast majority of instances, the index contains at least one
entry.

And it was natural to do it this way because at the time that condition
was introduced, the `index_state` structure had no explicit flag to
indicate that it was initialized: This flag was only introduced in
913e0e99b6a (unpack_trees(): protect the handcrafted in-core index from
read_cache(), 2008-08-23), but that commit did not adjust the code path
where no index file was found and a new, pristine index was initialized.

Now, when the index does not contain any entry (which is quite
common in Git's test suite because it starts quite a many repositories
from scratch), subsequent calls to `do_read_index()` will mistake the
index not to be initialized, and read it again unnecessarily.

This is a problem because after initializing the empty index e.g. the
`cache_tree` in that index could have been initialized before a
subsequent call to `do_read_index()` wants to ensure an initialized
index. And if that subsequent call mistakes the index not to have been
initialized, it would lead to leaked memory.

The correct fix for that memory leak is to adjust the condition so that
it does not mistake `active_nr == 0` to mean that the index has not yet
been read.

Using the `initialized` flag instead, we avoid that mistake, and as a
bonus we can fix a bug at the same time that was introduced by the
memory leak fix: When deleting all tracked files and then asking `git
commit -a -m ...` to commit the result, Git would internally update the
index, then discard and re-read the index undoing the update, and fail
to commit anything.

This fixes https://github.com/git-for-windows/git/issues/4462

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 12:20:04 -07:00
2023-04-17 21:16:04 +02:00
2023-04-17 21:16:04 +02:00
2023-04-17 21:15:59 +02:00
2023-04-17 21:16:10 +02:00
2022-10-07 17:19:59 -07:00
2022-07-10 14:43:34 -07:00
2023-04-17 21:16:10 +02:00
2023-02-27 10:08:57 -08:00
2023-02-18 09:29:13 -08:00
2023-01-23 13:39:51 -08:00
2022-08-03 13:36:09 -07:00
2023-02-15 17:11:52 -08:00
2023-02-22 14:55:45 -08:00
2022-10-30 21:04:44 -04:00
2023-01-09 13:28:36 +09:00
2023-01-09 13:28:36 +09:00
2023-04-17 21:16:10 +02:00
2023-01-02 21:37:18 +09:00
2022-07-19 12:45:31 -07:00
2023-02-27 10:08:56 -08:00
2023-02-27 10:08:56 -08:00
2023-04-17 21:15:59 +02:00
2022-03-28 10:25:52 -07:00
2023-04-17 21:16:08 +02:00
2023-04-17 21:15:56 +02:00
2023-04-17 21:16:10 +02:00
2023-02-24 11:32:29 -08:00
2023-02-22 14:55:45 -08:00
2023-04-17 21:15:49 +02:00
2023-04-17 21:15:59 +02:00
2023-04-17 21:15:44 +02:00
2022-04-06 15:21:59 -07:00
2023-04-17 21:15:49 +02:00
2022-05-02 09:50:37 -07:00
2022-09-14 12:56:39 -07:00
2023-04-17 21:16:04 +02:00
2022-09-14 12:56:39 -07:00
2022-12-15 09:09:38 +09:00
2023-01-09 13:28:36 +09:00
2022-10-30 21:04:41 -04:00
2022-08-29 14:55:11 -07:00
2022-08-22 15:08:30 -07:00
2022-12-13 21:23:36 +09:00
2023-04-17 21:15:49 +02:00
2023-04-17 21:16:10 +02:00
2023-04-17 21:15:52 +02:00
2022-12-01 18:38:07 +09:00
2022-10-30 14:04:51 -04:00
2022-08-30 14:16:49 -07:00
2022-10-24 12:45:26 -07:00
2022-10-24 12:45:26 -07:00
2023-01-02 21:37:18 +09:00
2022-12-13 21:09:40 +09:00
2022-12-13 21:09:40 +09:00
2022-05-02 09:50:37 -07:00
2023-01-23 13:39:51 -08:00
2022-12-26 11:42:05 +09:00

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.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt 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.txt (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 with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://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
Description
No description provided
Readme 582 MiB
Languages
C 50.5%
Shell 38.7%
Perl 4.5%
Tcl 3.2%
Python 0.8%
Other 2.1%