document/TranslateProject
2
0
Fork 0
mirror of https://github.com/LCTT/TranslateProject.git synced 2024-12-29 21:41:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21538 from DCOLIVERSUN/git-whats

Browse Source 
translation completed
This commit is contained in:
Xingyu.Wang 2021-04-08 21:40:12 +08:00 committed by GitHub
commit 2bce0f2e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
sources/tech/20210401 Find what changed in a Git commit.md
View File

@ -1,136 +0,0 @@
[#]: subject: (Find what changed in a Git commit)
[#]: via: (https://opensource.com/article/21/4/git-whatchanged)
[#]: author: (Seth Kenlon https://opensource.com/users/seth)
[#]: collector: (lujun9972)
[#]: translator: (DCOLIVERSUN)
[#]: reviewer: ( )
[#]: publisher: ( )
[#]: url: ( )
Find what changed in a Git commit
======
Git offers several ways you can quickly see which files changed in a
commit.
![Code going into a computer.][1]
If you use Git every day, you probably make a lot of commits. If you're using Git every day in a project with other people, it's safe to assume that _everyone_ is making lots of commits. Every day. And this means you're aware of how disorienting a Git log can become, with a seemingly eternal scroll of changes and no sign of what's been changed.
So how do you find out what file changed in a specific commit? It's easier than you think.
### Find what file changed in a commit
To find out which files changed in a given commit, use the `git log --raw` command. It's the fastest and simplest way to get insight into which files a commit affects. The `git log` command is underutilized in general, largely because it has so many formatting options, and many users get overwhelmed by too many choices and, in some cases, unclear documentation.
The log mechanism in Git is surprisingly flexible, though, and the `--raw` option provides a log of commits in your current branch, plus a list of each file that had changes made to it.
Here's the output of a standard `git log`:
```
$ git log
commit fbbbe083aed75b24f2c77b1825ecab10def0953c (HEAD -> dev, origin/dev)
Author: tux <[tux@example.com][2]>
Date:   Sun Nov 5 21:40:37 2020 +1300
    exit immediately from failed download
commit 094f9948cd995acfc331a6965032ea0d38e01f03 (origin/master, master)
Author: Tux <[tux@example.com][2]>
Date:   Fri Aug 5 02:05:19 2020 +1200
    export makeopts from etc/example.conf
commit 76b7b46dc53ec13316abb49cc7b37914215acd47
Author: Tux <[tux@example.com][2]>
Date:   Sun Jul 31 21:45:24 2020 +1200
    fix typo in help message
```
Even when the author helpfully specifies in the commit message which files changed, the log is fairly terse.
Here's the output of `git log --raw`:
```
$ git log --raw
commit fbbbe083aed75b24f2c77b1825ecab10def0953c (HEAD -> dev, origin/dev)
Author: tux <[tux@example.com][2]>
Date:   Sun Nov 5 21:40:37 2020 +1300
    exit immediately from failed download
:100755 100755 cbcf1f3 4cac92f M        src/example.lua
commit 094f9948cd995acfc331a6965032ea0d38e01f03 (origin/master, master)
Author: Tux <[tux@example.com][2]>
Date:   Fri Aug 5 02:05:19 2020 +1200
    export makeopts from etc/example.conf
   
:100755 100755 4c815c0 cbcf1f3 M     src/example.lua
:100755 100755 71653e1 8f5d5a6 M     src/example.spec
:100644 100644 9d21a6f e33caba R100  etc/example.conf  etc/example.conf-default
commit 76b7b46dc53ec13316abb49cc7b37914215acd47
Author: Tux <[tux@example.com][2]>
Date:   Sun Jul 31 21:45:24 2020 +1200
    fix typo in help message
:100755 100755 e253aaf 4c815c0 M        src/example.lua
```
This tells you exactly which file was added to the commit and how the file was changed (`A` for added, `M` for modified, `R` for renamed, and `D` for deleted).
### Git whatchanged
The `git whatchanged` command is a legacy command that predates the log function. Its documentation says you're not meant to use it in favor of `git log --raw` and implies it's essentially deprecated. However, I still find it a useful shortcut to (mostly) the same output (although merge commits are excluded), and I anticipate creating an alias for it should it ever be removed. If you don't need to merge commits in your log (and you probably don't, if you're only looking to see files that changed), try `git whatchanged` as an easy mnemonic.
### View changes
Not only can you see which files changed, but you can also make `git log` display exactly what changed in the files. Your Git log can produce an inline diff, a line-by-line display of all changes for each file, with the `--patch` option:
```
commit 62a2daf8411eccbec0af69e4736a0fcf0a469ab1 (HEAD -> master)
Author: Tux <[Tux@example.com][3]>
Date:   Wed Mar 10 06:46:58 2021 +1300
    commit
diff --git a/hello.txt b/hello.txt
index 65a56c3..36a0a7d 100644
\--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,2 @@
 Hello
-world
+opensource.com
```
In this example, the one-word line "world" was removed from `hello.txt` and the new line "opensource.com" was added.
These patches can be used with common Unix utilities like [diff and patch][4], should you need to make the same changes manually elsewhere. The patches are also a good way to summarize the important parts of what new information a specific commit introduces. This is an invaluable overview when you've introduced a bug during a sprint. To find the cause of the error faster, you can ignore the parts of a file that didn't change and review just the new code.
### Simple commands for complex results
You don't have to understand refs and branches and commit hashes to view what files changed in a commit. Your Git log was designed to report Git activity to you, and if you want to format it in a specific way or extract specific information, it's often a matter of wading through many screens of documentation to put together the right command. Luckily, one of the most common requests about Git history is available with just one or two options: `--raw` and `--patch`. And if you can't remember `--raw`, just think, "Git, what changed?" and type `git whatchanged`.
--------------------------------------------------------------------------------
via: https://opensource.com/article/21/4/git-whatchanged
作者：[Seth Kenlon][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://opensource.com/users/seth
[b]: https://github.com/lujun9972
[1]: https://opensource.com/sites/default/files/styles/image-full-size/public/lead-images/code_computer_development_programming.png?itok=4OM29-82 (Code going into a computer.)
[2]: mailto:tux@example.com
[3]: mailto:Tux@example.com
[4]: https://opensource.com/article/18/8/diffs-patches

136
translated/tech/20210401 Find what changed in a Git commit.md Normal file
View File

@ -0,0 +1,136 @@
[#]: subject: (Find what changed in a Git commit)
[#]: via: (https://opensource.com/article/21/4/git-whatchanged)
[#]: author: (Seth Kenlon https://opensource.com/users/seth)
[#]: collector: (lujun9972)
[#]: translator: (DCOLIVERSUN)
[#]: reviewer: ( )
[#]: publisher: ( )
[#]: url: ( )
查看 Git 提交中发生了什么变化
======
Git 提供了几种方式可以帮你快速查看提交中哪些文件被改变。
![运行在电脑中的代码][1]
如果你每天使用 Git，应该会提交不少改动。如果你每天和其他人在一个项目中使用 Git，假设 _每个人_ 每天的提交都是安全的，你会意识到 Git 日志会变得多么混乱，看似不停地滚动变化，却没有任何改变的迹象。
那么，你该怎样查看指定提交中文件发生哪些变化？这比你想的容易。
### 查看提交中文件发生的变化
为了发现指定提交中哪些文件发生变化，可以使用 `git log --raw` 命令。这是发现提交影响哪些文件的最快速、最方便的方法。`git log` 命令不常用，主要是因为它有太多的格式选项，许多用户在面对很多选择以及在一些情况下不明所以的文档时，会望而却步。
然而，Git 的日志机制非常灵活，`--raw` 选项提供了当前分支中的提交日志，以及更改的文件列表。
以下是标准的 `git log` 输出：
```
$ git log
commit fbbbe083aed75b24f2c77b1825ecab10def0953c (HEAD -> dev, origin/dev)
Author: tux <[tux@example.com][2]>
Date:   Sun Nov 5 21:40:37 2020 +1300
    exit immediately from failed download
commit 094f9948cd995acfc331a6965032ea0d38e01f03 (origin/master, master)
Author: Tux <[tux@example.com][2]>
Date:   Fri Aug 5 02:05:19 2020 +1200
    export makeopts from etc/example.conf
commit 76b7b46dc53ec13316abb49cc7b37914215acd47
Author: Tux <[tux@example.com][2]>
Date:   Sun Jul 31 21:45:24 2020 +1200
    fix typo in help message
```
即使作者在提交消息中指定了哪些文件发生变化，日志也相当简洁。
以下是 `git log --raw` 输出：
```
$ git log --raw
commit fbbbe083aed75b24f2c77b1825ecab10def0953c (HEAD -> dev, origin/dev)
Author: tux <[tux@example.com][2]>
Date:   Sun Nov 5 21:40:37 2020 +1300
    exit immediately from failed download
:100755 100755 cbcf1f3 4cac92f M        src/example.lua
commit 094f9948cd995acfc331a6965032ea0d38e01f03 (origin/master, master)
Author: Tux <[tux@example.com][2]>
Date:   Fri Aug 5 02:05:19 2020 +1200
    export makeopts from etc/example.conf
   
:100755 100755 4c815c0 cbcf1f3 M     src/example.lua
:100755 100755 71653e1 8f5d5a6 M     src/example.spec
:100644 100644 9d21a6f e33caba R100  etc/example.conf  etc/example.conf-default
commit 76b7b46dc53ec13316abb49cc7b37914215acd47
Author: Tux <[tux@example.com][2]>
Date:   Sun Jul 31 21:45:24 2020 +1200
    fix typo in help message
:100755 100755 e253aaf 4c815c0 M        src/example.lua
```
这会准确告诉你哪个文件被添加到提交中，哪些文件发生改变（`A` 是添加，`M` 是修改，`R` 是重命名，`D` 是删除）。
### Git whatchanged
`git whatchanged` 命令是日志功能之前的遗留命令。文档说用户不应该用该命令支持 `git log --raw`，并且暗示它本质上已经被否决了。除了合并提交，我仍然发现它的输出与 `git log --raw` 的输出大部分相同，它是一个有用的快捷方式。如果它被删除的话，我期望为他创建一个别名。如果你只想查看已更改的文件，不需要在日志中合并提交，可以尝试 `git whatchanged` 作为简单的助记符。
### 查看变化
你不仅可以看到哪些文件发生更改，还可以使用 `git log` 显示文件中发生了哪些变化。你的 Git 日志可以生成一个内联比较，用 `--patch` 选项可以逐行显示每个文件的所有更改：
```
commit 62a2daf8411eccbec0af69e4736a0fcf0a469ab1 (HEAD -> master)
Author: Tux <[Tux@example.com][3]>
Date:   Wed Mar 10 06:46:58 2021 +1300
    commit
diff --git a/hello.txt b/hello.txt
index 65a56c3..36a0a7d 100644
\--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,2 @@
 Hello
-world
+opensource.com
```
在这个例子中，"world" 这行字从 `hello.txt` 中删掉，"opensource.com" 这行字则添加进去。
如果你需要在其他地方手动进行相同的修改，这些<ruby>补丁<rt>patch</rt></ruby>可以与常见的 Unix 命令一起使用，例如 [diff 与 patch][4]。补丁也是一个好方法，可以总结指定提交中引入新信息的重要部分内容。当你在冲刺阶段引入一个 bug 时，你会发现这里的内容就是非常有价值的概述。为了更快地找到错误的原因，你可以忽略文件中没有更改的部分，只检查新代码。
### 得到复杂结果的简单命令
你不必理解引用、分支和提交哈希，就可以查看提交中更改了哪些文件。你的 Git 日志旨在向你报告 Git 活动，如果你想以特定方式格式化它或者提取特定的信息，通常需要费力地浏览许多文档来组合出正确的命令。幸运的是，Git 历史上最常用的请求之一只有一两个选项：`--raw` 与 `--patch`。如果你不记得 `--raw`，就想想“Git，改变什么了？”，然后输入 `git whatchanged`。
--------------------------------------------------------------------------------
via: https://opensource.com/article/21/4/git-whatchanged
作者：[Seth Kenlon][a]
选题：[lujun9972][b]
译者：[DCOLIVERSUN](https://github.com/DCOLIVERSUN)
校对：[校对者ID](https://github.com/校对者ID)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
[a]: https://opensource.com/users/seth
[b]: https://github.com/lujun9972
[1]: https://opensource.com/sites/default/files/styles/image-full-size/public/lead-images/code_computer_development_programming.png?itok=4OM29-82 (Code going into a computer.)
[2]: mailto:tux@example.com
[3]: mailto:Tux@example.com
[4]: https://opensource.com/article/18/8/diffs-patches