Elijah Newren 5ced7c3da0 merge-ort: ignore the directory rename split conflict for now
get_provisional_directory_renames() has code to detect directories being
evenly split between different locations.  However, as noted previously,
if there are no new files added to that directory that was split evenly,
our inability to determine where the directory was renamed to doesn't
matter since there are no new files to try to move into the new
location.  Unfortunately, that code is unaware of whether there are new
files under the directory in question and we just ignore that, causing
us to fail t6423 test 2b but pass test 2a; turn off the error for now,
swapping which tests pass and fail.

The motivating reason for switching this off as a temporary measure is
that as we add optimizations, we'll start looking at only subsets of
renames, and subsets of renames can start switching the result we get
when this error is (wrongly) on.  Once we get enough optimizations,
however, we can prevent that code from even running when there are no
new files added to the relevant directory, at which point we can revert
this commit and then both testcases 2a and 2b will pass simultaneously.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-01-23 23:30:06 -08:00
2020-12-08 14:48:16 -08:00
2020-11-09 14:06:25 -08:00
2020-09-22 12:36:28 -07: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
2020-11-21 15:14:38 -08:00
2020-09-02 14:39:25 -07:00
2020-11-18 13:32:53 -08:00
2020-08-11 18:04:11 -07:00
2020-12-17 15:06:40 -08:00
2020-08-10 10:23:57 -07:00
2021-01-06 23:33:44 -08:00
2021-01-06 23:33:44 -08:00
2020-08-27 14:04:49 -07: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
2020-12-18 15:15:18 -08:00
2020-11-02 13:17:44 -08:00
2020-11-21 15:14:38 -08:00
2020-08-27 14:04:49 -07: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
2020-08-10 10:23:57 -07:00
2020-11-09 14:06:25 -08:00
2020-11-11 13:18:38 -08:00
2021-01-06 23:33:44 -08:00
2020-07-30 19:18:06 -07: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
2020-07-30 19:18:06 -07:00
2020-07-28 15:02:17 -07:00
2020-12-08 15:11:18 -08:00
2020-05-01 13:39:55 -07:00
2020-11-21 15:14:38 -08:00
2020-11-25 15:24:52 -08:00
2020-12-08 15:11:18 -08:00
2020-08-28 14:07:09 -07:00
2020-07-30 19:18:06 -07:00
2020-07-06 22:09:13 -07:00
2020-03-24 15:04:44 -07:00
2020-03-24 15:04:44 -07:00
2020-11-21 15:14:38 -08: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
2020-10-27 15:09:49 -07:00
2020-04-29 16:15:27 -07:00
2020-12-08 15:11:20 -08: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
2020-09-02 14:39:25 -07:00
2020-07-30 19:18:06 -07:00
2020-07-30 19:18:06 -07:00
2020-07-30 19:18:06 -07:00
2020-07-28 15:02:17 -07: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 279 MiB
Languages
C 50.5%
Shell 38.7%
Perl 4.5%
Tcl 3.2%
Python 0.8%
Other 2.1%