mirror of
https://github.com/LCTT/TranslateProject.git
synced 2024-12-23 21:20:42 +08:00
Merge pull request #30839 from lujun9972/add-MjAyNDAxMjYgSW5zaWRlIC5naXQubWQK
选题[tech]: 20240126 Inside .git
This commit is contained in:
Xingyu.Wang
GitHub
commit
701bc8b885
315
sources/tech/20240126 Inside .git.md
Normal file
315
sources/tech/20240126 Inside .git.md
Normal file
@ -0,0 +1,315 @@
|
|||||||
|
[#]: subject: "Inside .git"
|
||||||
|
[#]: via: "https://jvns.ca/blog/2024/01/26/inside-git/"
|
||||||
|
[#]: author: "Julia Evans https://jvns.ca/"
|
||||||
|
[#]: collector: "lujun9972/lctt-scripts-1705972010"
|
||||||
|
[#]: translator: " "
|
||||||
|
[#]: reviewer: " "
|
||||||
|
[#]: publisher: " "
|
||||||
|
[#]: url: " "
|
||||||
|
|
||||||
|
Inside .git
|
||||||
|
======
|
||||||
|
|
||||||
|
Hello! I posted a comic on Mastodon this week about what’s in the `.git` directory and someone requested a text version, so here it is. I added some extra notes too. First, here’s the image. It’s a ~15 word explanation of each part of your `.git` directory.
|
||||||
|
|
||||||
|
[![][1]][2]
|
||||||
|
|
||||||
|
You can `git clone https://github.com/jvns/inside-git` if you want to run all these examples yourself.
|
||||||
|
|
||||||
|
Here’s a table of contents:
|
||||||
|
|
||||||
|
* [HEAD: .git/head][3]
|
||||||
|
* [branch: .git/refs/heads/main][4]
|
||||||
|
* [commit: .git/objects/10/93da429…][5]
|
||||||
|
* [tree: .git/objects/9f/83ee7550…][6]
|
||||||
|
* [blobs: .git/objects/5a/475762c…][7]
|
||||||
|
* [reflog: .git/logs/refs/heads/main][8]
|
||||||
|
* [remote-tracking branches: .git/refs/remotes/origin/main][9]
|
||||||
|
* [tags: .git/refs/tags/v1.0][10]
|
||||||
|
* [the stash: .git/refs/stash][11]
|
||||||
|
* [.git/config][12]
|
||||||
|
* [hooks: .git/hooks/pre-commit][13]
|
||||||
|
* [the staging area: .git/index][14]
|
||||||
|
* [this isn’t exhaustive][15]
|
||||||
|
* [this isn’t meant to completely explain git][16]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
The first 5 parts (`HEAD`, branch, commit, tree, blobs) are the core of git.
|
||||||
|
|
||||||
|
### HEAD: `.git/head`
|
||||||
|
|
||||||
|
**`HEAD`** is a tiny file that just contains the name of your current **branch**.
|
||||||
|
|
||||||
|
Example contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ cat .git/HEAD
|
||||||
|
ref: refs/heads/main
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
`HEAD` can also be a commit ID, that’s called “detached HEAD state”.
|
||||||
|
|
||||||
|
### branch: `.git/refs/heads/main`
|
||||||
|
|
||||||
|
A **branch** is stored as a tiny file that just contains 1 **commit ID**. It’s stored in a folder called `refs/heads`.
|
||||||
|
|
||||||
|
Example contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ cat .git/refs/heads/main
|
||||||
|
1093da429f08e0e54cdc2b31526159e745d98ce0
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
### commit: `.git/objects/10/93da429...`
|
||||||
|
|
||||||
|
A **commit** is a small file containing its parent(s), message, **tree** , and author.
|
||||||
|
|
||||||
|
Example contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ git cat-file -p 1093da429f08e0e54cdc2b31526159e745d98ce0
|
||||||
|
tree 9f83ee7550919867e9219a75c23624c92ab5bd83
|
||||||
|
parent 33a0481b440426f0268c613d036b820bc064cdea
|
||||||
|
author Julia Evans <julia@example.com> 1706120622 -0500
|
||||||
|
committer Julia Evans <julia@example.com> 1706120622 -0500
|
||||||
|
|
||||||
|
add hello.py
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
These files are compressed, the best way to see objects is with `git cat-file -p HASH`.
|
||||||
|
|
||||||
|
### tree: `.git/objects/9f/83ee7550...`
|
||||||
|
|
||||||
|
**Trees** are small files with directory listings. The files in it are called **blobs**.
|
||||||
|
|
||||||
|
Example contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ git cat-file -p 9f83ee7550919867e9219a75c23624c92ab5bd83
|
||||||
|
100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 .gitignore
|
||||||
|
100644 blob 665c637a360874ce43bf74018768a96d2d4d219a hello.py
|
||||||
|
040000 tree 24420a1530b1f4ec20ddb14c76df8c78c48f76a6 lib
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
The permissions here LOOK like unix permissions, but they’re actually super restricted, only 644 and 755 are allowed.
|
||||||
|
|
||||||
|
### blobs: `.git/objects/5a/475762c...`
|
||||||
|
|
||||||
|
**blobs** are the files that contain your actual code
|
||||||
|
|
||||||
|
Example contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ git cat-file -p 665c637a360874ce43bf74018768a96d2d4d219a
|
||||||
|
print("hello world!")
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
Storing a new blob with every change can get big, so `git gc` periodically [packs them][17] for efficiency in `.git/objects/pack`.
|
||||||
|
|
||||||
|
### reflog: `.git/logs/refs/heads/main`
|
||||||
|
|
||||||
|
The reflog stores the history of every branch, tag, and HEAD. For (mostly) every file in `.git/refs`, there’s a corresponding log in `.git/logs/refs`.
|
||||||
|
|
||||||
|
Example content for the `main` branch:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ tail -n 1 .git/logs/refs/heads/main
|
||||||
|
33a0481b440426f0268c613d036b820bc064cdea
|
||||||
|
1093da429f08e0e54cdc2b31526159e745d98ce0
|
||||||
|
Julia Evans <julia@example.com>
|
||||||
|
1706119866 -0500
|
||||||
|
commit: add hello.py
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
each line of the reflog has:
|
||||||
|
|
||||||
|
* before/after commit IDs
|
||||||
|
* user
|
||||||
|
* timestamp
|
||||||
|
* log message
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Normally it’s all one line, I just wrapped it for readability here.
|
||||||
|
|
||||||
|
### remote-tracking branches: `.git/refs/remotes/origin/main`
|
||||||
|
|
||||||
|
**Remote-tracking branches** store the most recently seen **commit ID** for a remote branch
|
||||||
|
|
||||||
|
Example content:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ cat .git/refs/remotes/origin/main
|
||||||
|
fcdeb177797e8ad8ad4c5381b97fc26bc8ddd5a2
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
When git status says “you’re up to date with `origin/main`”, it’s just looking at this. It’s often out of date, you can update it with `git fetch origin main`.
|
||||||
|
|
||||||
|
### tags: `.git/refs/tags/v1.0`
|
||||||
|
|
||||||
|
A tag is a tiny file in `.git/refs/tags` containing a commit ID.
|
||||||
|
|
||||||
|
Example content:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ cat .git/refs/tags/v1.0
|
||||||
|
1093da429f08e0e54cdc2b31526159e745d98ce0
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
Unlike branches, when you make new commits it doesn’t update the tag.
|
||||||
|
|
||||||
|
### the stash: `.git/refs/stash`
|
||||||
|
|
||||||
|
The stash is a tiny file called `.git/refs/stash`. It contains the commit ID of a commit that’s created when you run `git stash`.
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
cat .git/refs/stash
|
||||||
|
62caf3d918112d54bcfa24f3c78a94c224283a78
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
The stash is a stack, and previous values are stored in `.git/logs/refs/stash` (the reflog for `stash`).
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
cat .git/logs/refs/stash
|
||||||
|
62caf3d9 e85c950f Julia Evans <julia@example.com> 1706290652 -0500 WIP on main: 1093da4 add hello.py
|
||||||
|
00000000 62caf3d9 Julia Evans <julia@example.com> 1706290668 -0500 WIP on main: 1093da4 add hello.py
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
Unlike branches and tags, if you `git stash pop` a commit from the stash, it’s **deleted** from the reflog so it’s almost impossible to find it again. The stash is the only reflog in git where things get deleted very soon after they’re added. (entries expire out of the branch reflogs too, but generally only after 90 days)
|
||||||
|
|
||||||
|
**A note on refs:**
|
||||||
|
|
||||||
|
At this point you’ve probably noticed that a lot of things (branches, remote-tracking branches, tags, and the stash) are commit IDs in `.git/refs`. They’re called “references” or “refs”. Every ref is a commit ID, but the different types of refs are treated VERY differently by git, so I find it useful to think about them separately even though they all use the same file format. For example, git deletes things from the stash reflog in a way that it won’t for branch or tag reflogs.
|
||||||
|
|
||||||
|
### .git/config
|
||||||
|
|
||||||
|
`.git/config` is a config file for the repository. It’s where you configure your remotes.
|
||||||
|
|
||||||
|
Example content:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
[remote "origin"]
|
||||||
|
url = git@github.com: jvns/int-exposed
|
||||||
|
fetch = +refs/heads/*: refs/remotes/origin/*
|
||||||
|
[branch "main"]
|
||||||
|
remote = origin
|
||||||
|
merge refs/heads/main
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
git has local and global settings, the local settings are here and the global ones are in `~/.gitconfig` hooks
|
||||||
|
|
||||||
|
### hooks: `.git/hooks/pre-commit`
|
||||||
|
|
||||||
|
Hooks are optional scripts that you can set up to run (eg before a commit) to do anything you want.
|
||||||
|
|
||||||
|
Example content:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
#!/bin/bash
|
||||||
|
any-commands-you-want
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
(this obviously isn’t a real pre-commit hook)
|
||||||
|
|
||||||
|
### the staging area: `.git/index`
|
||||||
|
|
||||||
|
The staging area stores files when you’re preparing to commit. This one is a binary file, unlike a lot of things in git which are essentially plain text files.
|
||||||
|
|
||||||
|
As far as I can tell the best way to look at the contents of the index is with `git ls-files --stage`:
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
$ git ls-files --stage
|
||||||
|
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 .gitignore
|
||||||
|
100644 665c637a360874ce43bf74018768a96d2d4d219a 0 hello.py
|
||||||
|
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 lib/empty.py
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
### this isn’t exhaustive
|
||||||
|
|
||||||
|
There are some other things in `.git` like `FETCH_HEAD`, `worktrees`, and `info`. I only included the ones that I’ve found it useful to understand.
|
||||||
|
|
||||||
|
### this isn’t meant to completely explain git
|
||||||
|
|
||||||
|
One of the most common pieces of advice I hear about git is “just learn how the `.git` directory is structured and then you’ll understand everything!“.
|
||||||
|
|
||||||
|
I love understanding the internals of things more than anyone, but there’s a LOT that “how the .git directory is structured” doesn’t explain, like:
|
||||||
|
|
||||||
|
* how merges and rebases work and how they can go wrong (for instance this list of [what can go wrong with rebase][18])
|
||||||
|
* how exactly your colleagues are using git, and what guidelines you should be following to work with them successfully
|
||||||
|
* how pushing/pulling code from other repositories works
|
||||||
|
* how to handle merge conflicts
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Hopefully this will be useful to some folks out there though.
|
||||||
|
|
||||||
|
### some other references:
|
||||||
|
|
||||||
|
* the book [building git][19] by James Coglan (side note: looks like there’s a [50% off discount for the rest of January][20])
|
||||||
|
* [git from the inside out][21] by mary rose cook
|
||||||
|
* the official [git repository layout docs][22]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
via: https://jvns.ca/blog/2024/01/26/inside-git/
|
||||||
|
|
||||||
|
作者：[Julia Evans][a]
|
||||||
|
选题：[lujun9972][b]
|
||||||
|
译者：[译者ID](https://github.com/译者ID)
|
||||||
|
校对：[校对者ID](https://github.com/校对者ID)
|
||||||
|
|
||||||
|
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||||
|
|
||||||
|
[a]: https://jvns.ca/
|
||||||
|
[b]: https://github.com/lujun9972
|
||||||
|
[1]: https://wizardzines.com/images/uploads/inside-git.png
|
||||||
|
[2]: https://wizardzines.com/comics/inside-git
|
||||||
|
[3]: tmp.MwNheYBHl9#head-git-head
|
||||||
|
[4]: tmp.MwNheYBHl9#branch-git-refs-heads-main
|
||||||
|
[5]: tmp.MwNheYBHl9#commit-git-objects-10-93da429
|
||||||
|
[6]: tmp.MwNheYBHl9#tree-git-objects-9f-83ee7550
|
||||||
|
[7]: tmp.MwNheYBHl9#blobs-git-objects-5a-475762c
|
||||||
|
[8]: tmp.MwNheYBHl9#reflog-git-logs-refs-heads-main
|
||||||
|
[9]: tmp.MwNheYBHl9#remote-tracking-branches-git-refs-remotes-origin-main
|
||||||
|
[10]: tmp.MwNheYBHl9#tags-git-refs-tags-v1-0
|
||||||
|
[11]: tmp.MwNheYBHl9#the-stash-git-refs-stash
|
||||||
|
[12]: tmp.MwNheYBHl9#git-config
|
||||||
|
[13]: tmp.MwNheYBHl9#hooks-git-hooks-pre-commit
|
||||||
|
[14]: tmp.MwNheYBHl9#the-staging-area-git-index
|
||||||
|
[15]: tmp.MwNheYBHl9#this-isn-t-exhaustive
|
||||||
|
[16]: tmp.MwNheYBHl9#this-isn-t-meant-to-completely-explain-git
|
||||||
|
[17]: https://codewords.recurse.com/issues/three/unpacking-git-packfiles
|
||||||
|
[18]: https://jvns.ca/blog/2023/11/06/rebasing-what-can-go-wrong-/
|
||||||
|
[19]: https://shop.jcoglan.com/building-git/
|
||||||
|
[20]: https://mastodon.social/@jcoglan/111807463940323655
|
||||||
|
[21]: https://maryrosecook.com/blog/post/git-from-the-inside-out
|
||||||
|
[22]: https://git-scm.com/docs/gitrepository-layout#Documentation/gitrepository-layout.txt-index
|
||||||
Loading…
Reference in New Issue
Block a user