Ævar Arnfjörð Bjarmason 8354cf752e t7610: fix flaky timeout issue, don't clone from example.com
When t7610-mergetool.sh runs without failures the git://example.com
submodule URLs will never be used. That's because we "git submodule
add" it, but then manually populate them so that subsequent "git
submodule update -N" won't attempt to clone it, only update it without
fetching.

But if we fail in an earlier test it'll have the knock-on effect of
having later tests hang on that "git submodule update -N" as we
attempt to clone this repository from example.com.

This can be reproduced on "master" by running the test with
SANITIZE=leak without "--immediate". With
"GIT_TEST_PASSING_SANITIZE_LEAK=true" (which the linux-leaks job uses)
we'll skip the test entirely. So we'll only run into this when running
it manually, or with the "GIT_TEST_PASSING_SANITIZE_LEAK=check" mode.

That's not because the failure has anything to do with leak detection
per-se. It just so happens that we have a leak that'll fail before
we've managed to fully set these up, and therefore "git submodule
update -N" ends up spawning "git clone".

Let's instead continue lying about the origin of this submodule by
providing a URL for it that doesn't work, but now one that *really*
doesn't work: /dev/null. If the test is passing we won't ever use
this, and if we have knock-on failures we'll fail early, instead of
waiting for a timeout.

The behavior of "-N" here might be surprising to some, since it's
explained as "[if you use -N we] don’t fetch new objects from the
remote site". But (perhaps counter-intuitively) it's only talking
about if it needs to do so via "git fetch". In this case we'll end up
spawning a "git clone", as we have no submodule set up.

See ff7f089ed10 (mergetool: Teach about submodules, 2011-04-13) for
the commit that implemented these "example.com" tests.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-11-09 17:29:31 -05:00
2022-10-25 17:11:44 -07:00
2022-11-08 17:18:48 -05:00
2022-10-07 17:19:59 -07:00
2022-10-01 19:10:41 +08:00
2022-07-10 14:43:34 -07:00
2022-10-27 14:51:53 -07:00
2022-10-30 21:04:43 -04:00
2022-10-06 09:59:17 -07:00
2022-08-03 13:36:09 -07:00
2022-10-12 09:13:25 -07:00
2022-10-30 21:04:44 -04:00
2021-03-13 16:00:09 -08:00
2022-10-30 21:04:44 -04:00
2022-06-10 15:04:13 -07:00
2022-07-19 12:45:31 -07:00
2021-03-13 16:00:09 -08:00
2022-11-08 17:15:12 -05:00
2022-03-28 10:25:52 -07:00
2022-10-25 15:44:18 -07:00
2021-09-23 13:44:48 -07:00
2022-10-07 17:19:59 -07:00
2022-07-19 16:40:19 -07:00
2022-04-06 15:21:59 -07:00
2022-05-02 09:50:37 -07:00
2021-03-13 16:00:09 -08:00
2021-03-13 16:00:09 -08:00
2022-09-14 12:56:39 -07:00
2022-10-30 21:04:44 -04:00
2021-03-13 16:00:09 -08:00
2022-09-14 12:56:39 -07:00
2022-09-14 12:56:39 -07: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-09-14 12:56:39 -07:00
2021-08-24 15:32:37 -07:00
2022-08-03 13:36:09 -07:00
2022-04-06 09:42:12 -07: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
2022-10-30 21:04:44 -04:00
2022-03-23 14:09:29 -07:00
2021-05-04 11:52:02 +09:00
2021-05-04 11:52:02 +09:00
2022-05-02 09:50:37 -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 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 614 MiB
Languages
C 50.5%
Shell 38.7%
Perl 4.5%
Tcl 3.2%
Python 0.8%
Other 2.1%