Jeff King 680ff910b0 rerere: use strmap to store rerere directories
We store a struct for each directory we access under .git/rr-cache. The
structs are kept in an array sorted by the binary hash associated with
their name (and we do lookups with a binary search).

This works OK, but there are a few small downsides:

 - the amount of code isn't huge, but it's more than we'd need using one
   of our other stock data structures

 - the insertion into a sorted array is quadratic (though in practice
   it's unlikely anybody has enough conflicts for this to matter)

 - it's intimately tied to the representation of an object hash. This
   isn't a big deal, as the conflict ids we generate use the same hash,
   but it produces a few awkward bits (e.g., we are the only user of
   hash_pos() that is not using object_id).

Let's instead just treat the directory names as strings, and store them
in a strmap. This is less code, and removes the use of hash_pos().

Insertion is now non-quadratic, though we probably use a bit more
memory. Besides the hash table overhead, and storing hex bytes instead
of a binary hash, we actually store each name twice. Other code expects
to access the name of a rerere_dir struct from the struct itself, so we
need a copy there. But strmap keeps its own copy of the name, as well.

Using a bare hashmap instead of strmap means we could use the name for
both, but at the cost of extra code (e.g., our own comparison function).
Likewise, strmap has a feature to use a pointer to the in-struct name at
the cost of a little extra code. I didn't do either here, as simple code
seemed more important than squeezing out a few bytes of efficiency.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-01-28 11:26:20 -08:00
2021-01-25 14:19:20 -08:00
2020-12-08 14:48:16 -08:00
2020-11-09 14:06:25 -08:00
2021-01-25 14:19:20 -08:00
2020-08-13 11:02:15 -07:00
2020-12-08 15:11:21 -08:00
2020-03-05 10:43:02 -08:00
2020-12-08 15:11:17 -08:00
2020-12-18 15:15:18 -08:00
2019-09-28 14:04:16 +09:00
2019-11-18 15:21:28 +09:00
2021-01-04 13:01:55 -08:00
2020-11-21 15:14:38 -08:00
2020-09-02 14:39:25 -07:00
2019-07-09 15:25:44 -07:00
2020-11-18 13:32:53 -08:00
2020-08-11 18:04:11 -07:00
2021-01-25 14:19:19 -08:00
2020-08-10 10:23:57 -07:00
2021-01-25 14:19:19 -08:00
2021-01-25 14:19:19 -08:00
2019-12-01 09:04:36 -08:00
2020-07-06 22:09:13 -07:00
2020-08-24 14:54:31 -07:00
2020-11-12 09:40:06 -08:00
2020-07-30 19:18:06 -07:00
2019-05-05 15:20:10 +09:00
2020-11-21 15:14:38 -08:00
2020-07-30 19:18:06 -07:00
2020-07-28 15:02:17 -07:00
2020-09-03 12:37:04 -07:00
2020-03-24 15:04:43 -07:00
2021-01-25 14:19:17 -08:00
2021-01-05 14:58:29 -08:00
2020-08-10 10:23:57 -07:00
2020-11-09 14:06:25 -08:00
2021-01-06 23:33:44 -08:00
2021-01-25 14:19:19 -08:00
2020-07-30 19:18:06 -07:00
2019-11-18 15:21:28 +09:00
2020-11-30 13:55:54 -08:00
2020-07-30 19:18:06 -07:00
2020-06-25 12:27:47 -07:00
2020-12-14 15:01:03 -08:00
2019-11-18 15:21:28 +09:00
2020-07-30 19:18:06 -07:00
2020-07-28 15:02:17 -07:00
2021-01-25 14:19:17 -08:00
2021-01-25 14:19:17 -08:00
2020-05-01 13:39:55 -07:00
2021-01-25 14:19:20 -08:00
2020-08-28 14:07:09 -07:00
2020-07-30 19:18:06 -07:00
2019-12-16 13:08:39 -08:00
2020-07-06 22:09:13 -07:00
2018-11-02 12:14:21 +09:00
2020-03-24 15:04:44 -07:00
2020-03-24 15:04:44 -07:00
2020-12-14 10:21:36 -08:00
2020-10-27 15:09:50 -07:00
2021-01-06 23:33:44 -08:00
2021-01-12 12:06:14 -08:00
2020-04-29 16:15:27 -07:00
2020-11-21 15:14:38 -08:00
2020-07-28 15:02:17 -07:00
2020-08-11 18:04:11 -07:00
2019-11-13 10:09:10 +09:00
2019-11-18 15:21:29 +09:00
2020-07-30 19:18:06 -07:00
2020-07-30 19:18:06 -07:00
2018-12-09 12:37:32 +09:00
2019-09-05 14:10:18 -07:00
2020-07-30 19:18:06 -07:00
2020-07-28 15:02:17 -07:00
2019-11-10 16:00:54 +09:00
2020-11-02 13:17:46 -08:00
2020-10-05 14:01:52 -07: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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. 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%