1
0
mirror of https://github.com/git/git.git synced 2025-03-28 04:58:50 +00:00
Stefan Beller 1a248cf21d worktree: check if a submodule uses worktrees
In a later patch we want to move around the the git directory of
a submodule. Both submodules as well as worktrees are involved in
placing git directories at unusual places, so their functionality
may collide. To react appropriately to situations where worktrees
in submodules are in use, offer a new function to query the
a submodule if it uses the worktree feature.

An earlier approach:
  "Implement submodule_get_worktrees and just count them", however:
  This can be done cheaply (both in new code to write as well as run time)
  by obtaining the list of worktrees based off that submodules git
  directory. However as we have loaded the variables for the current
  repository, the values in the submodule worktree
  can be wrong, e.g.
  * core.ignorecase may differ between these two repositories
  * the ref resolution is broken (refs/heads/branch in the submodule
    resolves to the sha1 value of the `branch` in the current repository
    that may not exist or have another sha1)

The implementation here is just checking for any files in
$GIT_COMMON_DIR/worktrees for the submodule, which ought to be sufficient
if the submodule is using the current repository format, which we also
check.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-12 15:15:07 -08:00
2016-11-01 12:58:49 -07:00
2016-11-17 13:47:36 -08:00
2016-10-20 09:33:17 -07:00
2016-10-17 13:25:20 -07:00
2016-09-26 17:46:44 -07:00
2016-11-11 13:56:30 -08:00
2016-09-29 15:42:18 -07:00
2016-10-31 13:15:21 -07:00
2016-08-12 09:47:37 -07:00
2016-10-10 14:03:50 -07:00
2016-10-31 13:15:21 -07:00
2016-10-31 13:15:21 -07:00
2016-10-31 13:15:21 -07:00
2016-07-27 14:15:51 -07:00
2016-10-27 14:58:50 -07:00
2016-09-29 15:42:18 -07:00
2016-10-27 14:58:47 -07:00
2016-09-29 15:42:18 -07:00
2016-07-01 12:44:57 -07:00
2016-07-01 12:44:57 -07:00
2016-08-11 14:35:42 -07:00
2016-10-14 01:36:12 +00:00
2016-11-17 13:47:36 -08:00
2016-12-09 14:52:57 -08:00
2016-09-29 15:42:18 -07:00
2016-10-17 13:25:18 -07:00
2016-07-06 13:38:06 -07:00
2016-09-29 15:42:18 -07:00
2016-11-11 13:56:30 -08:00
2016-10-17 13:25:21 -07:00
2016-07-29 11:05:07 -07:00
2016-07-29 11:05:07 -07:00
2016-09-26 16:09:18 -07:00
2016-09-29 15:42:18 -07:00
2016-09-25 16:44:13 -07:00
2016-09-29 15:42:18 -07:00
2016-10-17 13:25:21 -07:00
2016-10-28 09:01:23 -07:00
2016-07-28 11:26:03 -07:00
2016-07-28 11:26:03 -07:00
2016-10-10 14:03:46 -07:00
2016-10-26 13:14:45 -07:00
2016-10-10 14:03:50 -07:00
2016-10-11 14:24:02 -07:00
2016-10-10 14:03:50 -07:00
2016-07-14 15:50:41 -07:00
2016-09-29 15:42:18 -07:00
2016-11-10 13:17:30 -08:00
2016-10-10 14:03:46 -07:00
2016-10-31 13:15:21 -07:00
2016-07-01 15:09:10 -07:00
2016-09-29 15:42:18 -07:00
2016-08-05 09:28:17 -07:00
2016-10-31 13:15:22 -07:00
2016-10-27 14:58:48 -07:00
2016-10-27 14:58:48 -07:00
2016-09-29 15:42:18 -07:00
2016-10-31 13:15:21 -07:00
2016-09-19 13:47:18 -07:00
2016-10-27 14:58:50 -07:00

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 http://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-.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 http://news.gmane.org/gmane.comp.version-control.git/, http://marc.info/?l=git and other archival sites.

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
Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Readme 799 MiB
Languages
C 50.1%
Shell 38.4%
Perl 5.1%
Tcl 3.3%
Python 0.8%
Other 2%