Compare commits

...

7 Commits

  1. 3
      archetypes/default.md
  2. 14
      config.toml
  3. 279
      content/post/renames-in-git-explained.md
  4. 149
      static/publickey.asc
  5. 2
      themes/even

@ -2,5 +2,8 @@
title: "{{ replace .Name "-" " " | title }}" title: "{{ replace .Name "-" " " | title }}"
date: {{ .Date }} date: {{ .Date }}
draft: true draft: true
toc: true
tags: []
author: "Gaël Depreeuw"
--- ---

@ -6,7 +6,7 @@ preserveTaxonomyNames = true
enableRobotsTXT = true enableRobotsTXT = true
enableEmoji = true enableEmoji = true
theme = "even" theme = "even"
enableGitInfo = false # use git commit log to generate lastmod record enableGitInfo = true # use git commit log to generate lastmod record
# Syntax highlighting by Chroma. NOTE: Don't enable `highlightInClient` and `chroma` at the same time! # Syntax highlighting by Chroma. NOTE: Don't enable `highlightInClient` and `chroma` at the same time!
pygmentsOptions = "linenos=table" pygmentsOptions = "linenos=table"
@ -53,11 +53,11 @@ copyright = "Gaël Depreeuw"
since = "2020" since = "2020"
# use public git repo url to link lastmod git commit, enableGitInfo should be true. # use public git repo url to link lastmod git commit, enableGitInfo should be true.
# 指定 git 仓库地址,可以生成指向最近更新的 git commit 的链接,需要将 enableGitInfo 设置成 true. # 指定 git 仓库地址,可以生成指向最近更新的 git commit 的链接,需要将 enableGitInfo 设置成 true.
gitRepo = "" gitRepo = "https://gitea.depreeuw.dev/Mithror/main-site"
# site info (optional) # 站点信息(可选,不需要的可以直接注释掉) # site info (optional) # 站点信息(可选,不需要的可以直接注释掉)
logoTitle = "Gaël Depreeuw" # default: the title value # 默认值: 上面设置的title值 logoTitle = "Gaël Depreeuw" # default: the title value # 默认值: 上面设置的title值
keywords = ["Hugo", "theme","even"] keywords = ["git", "blog","hugo", "even"]
description = "Gaël Depreeuw's personal site" description = "Gaël Depreeuw's personal site"
# paginate of archives, tags and categories # 归档、标签、分类每页显示的文章数目,建议修改为一个较大的值 # paginate of archives, tags and categories # 归档、标签、分类每页显示的文章数目,建议修改为一个较大的值
@ -175,14 +175,14 @@ copyright = "Gaël Depreeuw"
wechat = "/path/to/your/wechat-qr-code.png" # 微信二维码 wechat = "/path/to/your/wechat-qr-code.png" # 微信二维码
alipay = "/path/to/your/alipay-qr-code.png" # 支付宝二维码 alipay = "/path/to/your/alipay-qr-code.png" # 支付宝二维码
[params.social] # 社交链接 [params.social.asFont] # 社交链接
a-email = "mailto:gael@depreeuw.dev" a-email = "mailto:gael@depreeuw.dev"
# b-stack-overflow = "http://localhost:1313" # b-stack-overflow = "http://localhost:1313"
# c-twitter = "http://localhost:1313" # c-twitter = "http://localhost:1313"
# d-facebook = "http://localhost:1313" # d-facebook = "http://localhost:1313"
# e-linkedin = "http://localhost:1313" # e-linkedin = "http://localhost:1313"
# f-google = "http://localhost:1313" # f-google = "http://localhost:1313"
# g-github = "http://localhost:1313" b-github = "https://github.com/Mithror"
# h-weibo = "http://localhost:1313" # h-weibo = "http://localhost:1313"
# i-zhihu = "http://localhost:1313" # i-zhihu = "http://localhost:1313"
# j-douban = "http://localhost:1313" # j-douban = "http://localhost:1313"
@ -192,6 +192,10 @@ copyright = "Gaël Depreeuw"
# n-gitlab = "http://localhost:1313" # n-gitlab = "http://localhost:1313"
# o-bilibili = "http://localhost:1313" # o-bilibili = "http://localhost:1313"
[params.social.asSVG]
a-gitea = "https://gitea.depreeuw.dev/Mithror"
b-nextcloud = "https://nextcloud.depreeuw.dev"
# See https://gohugo.io/about/hugo-and-gdpr/ # See https://gohugo.io/about/hugo-and-gdpr/
[privacy] [privacy]
[privacy.googleAnalytics] [privacy.googleAnalytics]

@ -4,6 +4,7 @@ date: 2020-11-28T12:07:00Z
draft: false draft: false
toc: true toc: true
tags: ['tech', 'git', 'rename'] tags: ['tech', 'git', 'rename']
author: "Gaël Depreeuw"
--- ---
## Introduction ## Introduction
@ -13,168 +14,181 @@ handles file and/or directory renames. The short answer to this is: **It**
**doesn't**. **doesn't**.
The slightly longer answer is: **It does, but probably not in the way you** The slightly longer answer is: **It does, but probably not in the way you**
**envision it**. **envision it?**.
To help you understand this topic a bit more, we first have to go back to the Let's first take a look at how Git works internally. If you don't quite
basics: What actually is a file or directory name? The answer to this question understand everything which follows, I can recommend reading chapter 10 of
is highly dependent on the underlying file system, but in general it can be the [Git Pro Book 2nd. Edition](https://git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain).
boiled down to this:
> A file (or directory) name is an index used by the file system to look up the
> contents of the file. (Note: from now on I will only refer to file names, but
> the same applies to directory names as well.)
What you should note from this is that a filename is actually not a property of
the file content itself, but part of the meta-data regarding the content. In
Linux, for instance, the filename of a file is stored in the directory, which
is basically a associative array which maps filenames to inodes (the object
which stores the meta-data of a file).
When renaming a file, what you are actually doing is updating a look up table.
In Linux, this would be updating the associative array of the directory. If you
move a file, then you remove the element from one directory and add it to
another directory.
How this all works internally depends on the OS and the underlying file system,
but more importantly is seldom related to the content of a file. Which brings us
to the next chapter.
## Git stores content, not files ## Git stores content, not files
When you commit to a Git repository it basically does the following: When you commit to a Git repository it basically does the following:
For each directory (including the top one), create a **tree** object. This is Create a **blob** object for every file in the index (a.k.a. the staging area).
done by looking at every file and directory to be commited and create **blob** A blob object is created by taking the content of the file, prepending a header
objects for the files and tree objects for the directories. The hash of each and compressing the result. A SHA-1 hash is then calculated for this object
such object is added to this tree object together with the filename if the which will be used to identify the object. The object is stored in the aptly
object type is blob and the directory name if the object type is tree. This is named object store (found in `.git/objects`). The first 2 characters of the
then prepended with a header and compressed. The SHA-1 hash is calculated and hash (in hex format) are used as a directory within this store, while the
the object is stored in the object store (.git/objects), using the first two remaining characters are the filename of the blob object.
characters as a directory and the rest as filename.
It then creates a commit object which points to the top level tree's hash. Let's look at an example. Create a git repo somewhere and create a file.
> Note: it of course only really does this for files which were part of the
> staging area. That's the most efficient. Of course if the content of a file
> was changed, it hash will change and thus the tree object it was part of will
> change and its hash will also change and so on until the top level tree
> object.
As an example, suppose you have the following structure:
```bash ```bash
. git init foo
├── README.md cd foo
├── bar echo "foo" >> foo.txt
   ├── bar.md
   └── baz
   └── baz.md
└── foo
└── foo.md
``` ```
If you were to commit this structure to git, you will have (simplified): If you look into your `.git/objects` directory, it will be empty, aside from
two empty subdirectories. Let's create a blob out of this file now.
- 4 blob objects (README.md, bar.md, foo.md, baz.md) ```bash
- 4 tree objects (., ./foo, ./bar and ./bar/baz) $ git hash-object -w foo.txt
- 1 commit object 257cc5642cb1a054f08cc83f2d943e56fd3ebe99
```
In my case: You will now find an object in the store:
```bash ```bash
gael@Aviendha:~/git/tmp$ git commit -m "First commit" $ find .git/objects -type f
[master (root-commit) 8be3cf0] First commit
4 files changed, 4 insertions(+)
create mode 100644 README.md
create mode 100644 bar/bar.md
create mode 100644 bar/baz/baz.md
create mode 100644 foo/foo.md
gael@Aviendha:~/git/tmp$ find .git/objects/ -type f
.git/objects/52/01cdd884658a103819d66f910ea25ba1dad2e0
.git/objects/be/e527307ae70706c20eb89f205f444c3bb385e9
.git/objects/6b/dd34e3e9ab26062ab881adb1024923923b5f8e
.git/objects/8b/e3cf05d01320a124991a8e7c10fe83ec9cd5e3
.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99 .git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
.git/objects/f9/07d059fcdc9b594c6e14dc0c3826f26ab47832
.git/objects/e8/45566c06f9bf557d35e8292c37cf05d97a9769
.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf
``` ```
To get the top level tree object, just look at the commit: Here's an interesting exercise: what happens if you rename the file and create
the blob with the renamed file?
```bash ```bash
gael@Aviendha:~/git/tmp$ git cat-file -p 8be3cf0 $ mv foo.txt bar.txt
tree 5201cdd884658a103819d66f910ea25ba1dad2e0 $ git hash-object -w bar.txt
author Gaël Depreeuw <gael@depreeuw.dev> 1606569688 +0100 257cc5642cb1a054f08cc83f2d943e56fd3ebe99
committer Gaël Depreeuw <gael@depreeuw.dev> 1606569688 +0100
First commit
``` ```
And if we look at the tree: That's right, nothing changed! This makes sense as we're only adding the content
to the object store! So how does Git remember the file names?
```bash ## Filenames are part of tree objects
gael@Aviendha:~/git/tmp$ git cat-file -p 5201cdd
100644 blob e845566c06f9bf557d35e8292c37cf05d97a9769 README.md Aside from **blob** objects, Git also creates **tree** objects. You can sort of
040000 tree f907d059fcdc9b594c6e14dc0c3826f26ab47832 bar compare it to the directories in your worktree, i.e. for each directory in your
040000 tree 0c7d27db1f575263efdcab3dc650f4502a2dbcbf foo worktree, you will have a tree object. A tree object's content looks like:
```code
<mode> <type> <hash> <name>
...
<mode> <type> <hash> <name>
``` ```
The contents of `README.md` is: You can create a tree object yourself by doing:
```bash ```bash
gael@Aviendha:~/git/tmp$ git cat-file -p e845566 $ git update-index --add --cacheinfo 100644 \
README 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 foo.txt
$ git write-tree
fcf0be4d7e45f0ef9592682ad68e42270b0366b4
$ git cat-file -p fcf0be4d7e45f0ef9592682ad68e42270b0366b4
100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 foo.txt
``` ```
So what does this all mean, when we rename a file? There are 3 different types (that I know of) which can be referred to in a tree
object: blob, tree, commit. Blobs represent file content, tree represent other
tree (i.e. subdirectories) and commits represent submodules (i.e the commit
at which they are included). A commit is a type of object which is also present
outside the tree objects. They contain the top tree object (representing the
top level of your repository), a link to one or more parent commits and some
meta data (author, commit msg, date, ...). Finally and for completion's sake,
there is also an object for annotated tags, which contain the commit it is
pointing too as well as some meta data.
## Renaming file ## Renaming
If we're just looking at renaming a file, then the contents of the file will Armed with the knowledge about trees and blobs, it should be fairly easy to
not change. This means the blob object representing the file does not change. understand what happens if you rename a file. To make it easier to understand,
What does change is: consider a simple example: we just rename a file at the top level.
1. The old file's name is removed from the tree object it belong to. > Note: more complex examples are just more time consuming to explain, but
2. The new file's name is added to the tree object it belongs to (with the same > not to understand. The same principles apply.
hash in this case).
As such Git is not aware of any name changes. This is why the short answer is: In case of such a rename, when you commit this rename, your repository will
Git doesn't handle file renames. The repository itself has no notion of this be impacted as follows:
action. It's just has content and a structure for that content.
- The blob representing the file remains unchanged.
- The top level tree object changes as well because the filename associated with
the blob is different.
- The commit object will point to the new tree. (Its parent will point to the
old tree.)
Nowhere is there any special mention of a rename occuring. Remember, we're just
storing content! As such Git is not aware of any name changes. This is why the
short answer was: Git doesn't handle file renames. The repository itself has no
notion of this action. It's just has content and a structure for that content.
However, that does not mean you lose your history when you rename a file. However, that does not mean you lose your history when you rename a file.
### How to see history of a renamed file ### How to see history of a renamed file
When you remove and add a file (which is what a rename is for Git), Git will Git might not store information on renames in the repository but it does come
analyze this and when the files are X% alike (with X being defaulted to 50), packed with an algorithm that detects file renames. The way it works is that for
it will assume a rename occured. You can show the log of a file including every add/delete pair added to the index, it tries to determine a rename
renames using: candidate for every deleted file. It does this by comparing how similar the
paired files are. If they are at least 50% similar, it considered the pair to
have been a rename. If there are multiple rename candidates for one file, it
takes the one with the highest similarity percentage. If multipe files have the
same percentage, it picks one depending on the implementation.
```bash > **Note**: I believe, but am not sure, it basicaly takes the first
git log --follow -- <file> > alphabeticaly match in the last case.
```
If you want to adjust the treshold you can use the `-MX%` option, where X is the By default `git log -- <file>` does not track accross renames. If you want to
percentage you want (0-100). do see the history across renames, you will need to add the `--follow` option.
Because there is a percentage treshold, the recommendation is that you do not You can also define the treshold percentage to be different from 50%. This is
combine renaming a file, with modifying a file. If files are 100% identical when done via the `-M<n>` or `--find-renames=<n>` option. See the git documentation
adding/removing it makes it much easier to see them as renames. If on the other for the correct syntax.
hand, you rename a file and start modifying it heavily, Git might not detect
this as a rename, unless you lower the treshold.
You can also turn off rename detection by doing `--no-renames` You can also turn off rename detection by doing `--no-renames`
### Rename best practice
Because of the treshold and the cheapness of commits, it is recommended that
when you rename a file/directory, you commit those renames first, before you
continue working on the renamed file. This basically makes it so you can use
a treshold of 100% all the time.
### Why did Git do it this way
This is pure speculation, but here's my thoughts on it:
Filenames are actually part of the underlying file systems, so for a version
controls system to support multiple file system they have to handle filenames
in their own way. This includes renames. If you think about what this would
require for Git, it would not be very straightforward: Git could have chosen to
provide a command to store rename data, let's say: `git rename fileA fileB`, but
what should this command do? We can image it could create new '**rename**
object, which would hold the blob hash and the name of the previous file. Now,
every time you would walk through history, when you encounter this object type,
you would need to remember this redirections. There's probably a lot of little
nuances which are not immediately apparent though and it does not deal with one
of the major drawbacks of this new command: What happens if the user forgets it
and just does `mv fileA fileB`?
Well, we'd actually want to have some mechanism to detect this as a rename as
once this is commited it becomes more difficult to undo this change
(especially if we already pushed the commit!). So it sure would be nice if Git
could somehow figure out that it was a rename. Which is exactly what they did.
But now that we have this functionality, what actually is the point of the
new command we wanted to implement? This is probably highly subjective, but to
me it seems completely irrelevant now. Instead of having a command which can be
forgotten and for which we need contigency, just use the contigency as the
solution! It makes the behaviour a lot more consistent!
### Can I fix my commit if I did change a lot of content after renaming ### Can I fix my commit if I did change a lot of content after renaming
First, to prevent this: always check using `git status` whether are not the First, to prevent this: always check using `git status` whether are not the
rename is being detected. Now, how to solve it? rename is being detected. Now, how to solve it?
It depends. If your commit is local only and it is the last commit, then you can It depends. If your commit is local only and it is the last commit, then you can
fix this easily. There are many ways to to it, but a couple options are: fix this easily. There are many ways to to it, but one option is:
```bash ```bash
git mv <newname> <oldname> # Undo the file rename git mv <newname> <oldname> # Undo the file rename
@ -183,37 +197,40 @@ git mv <oldname> <newname> # Rename the file
git commit # Commit the rename git commit # Commit the rename
``` ```
If you want to rename first and the changes second you can also do this, but
it is a bit more complex:
```bash
git reset --soft HEAD~ # Go back one commit, but keep the changes
git restore --staged <oldname> <newname> # unstage the deletion and addition
git restore <oldname> # undelete the old file
mv <newname> <newname.tmp> # make a temp backup of the new file
git mv <oldname> <newname> # Rename the old file
git commit # commit the rename
cp <newname.tmp> <newname> # apply the new changes
git commit -a # Commit the changes
```
If the commit is already a couple of commits ago, you can do the same with an If the commit is already a couple of commits ago, you can do the same with an
interactive rebase and amending the commit at the right time. interactive rebase and doing either of the above at the correct time.
If you already pushed your commits you will have to check with the team if you If you already pushed your commits you will have to check with the team if you
can rewrite the history and push it. If this is not possible, you might need to can rewrite the history and push it. If this is not possible, you might need to
find the right treshold to have Git mark it as a rename. find the right treshold to have Git mark it as a rename.
### Why did Git do it this way
This is pure speculation but dealing with renames is not as easy as it first
looks. For instance you could add a git command to do a rename (like subversion
has), which could create a new type of object a rename object which links two
objects (old and new). But what if the user forgets to do this and just uses
`mv fileA fileB` and commits this? Should Git automatically assume this is a
rename? It could use the same treshold discused earlier to determine so. That
would make it easier. But then what is the point of having a dedicated rename
command? I think for easy of use, they just decided not to add such a command,
because it is not a solution for all instances. Instead, the rename detection
works good enough for everything and they leave it up to the commiter to make
sure his renames are detected properly.
## Summary ## Summary
So in summary: no, Git does not store renames in its repository. Instead, it So in summary: no, Git does not store renames in its repository. Instead, for
for every add/delete pair part of a commit, Git will do a likeness analysis and every add/delete pair in a commit, Git will do an similarity analysis and
when they are X% alike (default 50%), it will assume a rename occured. when they are X% alike (default 50%), it will assume a rename occured.
Some commands influenced by this are: git log, git diff and git merge. Options Some commands influenced by this are: `git log`, `git diff` and `git merge`.
related to renames are: Options related to renames are:
```txt ```txt
-M=<n>, --find-renames=<n> # where n is the treshold percentage. -M=<n>, --find-renames=<n> # where n is the treshold percentage.
--no-renames # don't do any rename detection --no-renames # don't do any rename detection
``` ```
It is best practise to handle renames in their own commits. Try to avoid
renaming and modifying a file within the same commit.

@ -0,0 +1,149 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
62dWDvlkjXY0vE7Wsj0=
=0lAx
-----END PGP PUBLIC KEY BLOCK-----

@ -1 +1 @@
Subproject commit da4320e8a56343ad37a4604e61915675fa18a270 Subproject commit 39a8165aaa6b726ce0947abb31c0ce09aa30e9d9
Loading…
Cancel
Save