1

我正在努力了解如何git blame -M以及git blame -C正在工作。

我创建了两个文件：

档案A：

A
B
C

文件B：

D
E
F

并将它们添加（并提交）到我的存储库（散列1234）。然后我复制了FileBto的内容FileA，使它看起来像这样：

档案A：

A
B
C
D
E
F

并提交更改（哈希4567）。

然后我跑了git blame -C FileA。

我期望输出：

1234 A
1234 B
1234 C
1234 D
1234 E
1234 F

但反而得到：

1234 A
1234 B
1234 C
4567 D
4567 E
4567 F

当我将块移动D E F到FileA并做时也是如此git blame -M FileA。

我是否误解了构建测试文件的目的，-C或者-M我错过了什么？

更新 1：-C将和 的值设置-M为 3 都没有帮助，处理更大的文本也没有帮助（用 3 段 lorem ipsum 尝试过）

4

1 回答 1

3

来自git help blame：

   -C|<num>|
       In addition to -M, detect lines moved or copied from other files that were modified in the same commit. This is
       useful when you reorganize your program and move code around across files. When this option is given twice, the
       command additionally looks for copies from other files in the commit that creates the file. When this option is given
       three times, the command additionally looks for copies from other files in any commit.

       <num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as
       moving/copying between files for it to associate those lines with the parent commit. **And the default value is 40**. If
       there are more than one -C options given, the <num> argument of the last -C will take effect.

注意并且默认值是 40？您的示例仅显示 6 个（或可能 9 个）字符的变化，远低于 40 个的阈值...

我怀疑您的测试输入不足以让算法检测到文本移动...

编辑：那里还有关于“在同一提交中修改的其他文件”的内容。所以这里有一个例子：

$ git init /tmp/foo
Initialized empty Git repository in /tmp/foo/.git/
$ cd /tmp/foo
$ cp /etc/motd file1
$ cp /etc/magic file2
$ cp /etc/os-release file3
$ git add file1 file2 file3
$ git commit -m baseline
[master (root-commit) 36a1d7] baseline
 3 files changed, 19 insertions(+)
 create mode 100644 file1
 create mode 100644 file2
 create mode 100644 file3
$ head -5 file2 >> file1
$ head -5 file3 >> file1
$ sed -i 1,5d file3
$ git add file1 file3
$ git commit -m second
[master b7a683] second
 2 files changed, 8 insertions(+), 5 deletions(-)
$ git log --pretty=oneline
 b7a683 (HEAD, master) second
 36a1d7 baseline
$ git blame file1
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  1) 
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  2) The programs included with the Debian GNU/Linux system are free software;
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  3) the exact distribution terms for each program are described in the
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  4) individual files in /usr/share/doc/*/copyright.
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  5) 
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  6) Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
 ^36a1d7 (Joe User 2015-03-26 17:19:10 -0500  7) permitted by applicable law.
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500  8) # Magic local data for file(1) command.
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500  9) # Insert here your local magic data. Format is described in magic(5).
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 10) 
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 11) PRETTY_NAME="Debian GNU/Linux 7 (wheezy)"
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 12) NAME="Debian GNU/Linux"
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 13) VERSION_ID="7"
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 14) VERSION="7 (wheezy)"
 b7a6839 (Joe User 2015-03-26 17:21:41 -0500 15) ID=debian
$ git blame -C file1
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  1) 
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  2) The programs included with the Debian GNU/Linux system are free software;
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  3) the exact distribution terms for each program are described in the
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  4) individual files in /usr/share/doc/*/copyright.
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  5) 
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  6) Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
 ^36a1d7 file1 (Joe User 2015-03-26 17:19:10 -0500  7) permitted by applicable law.
 b7a6839 file1 (Joe User 2015-03-26 17:21:41 -0500  8) # Magic local data for file(1) command.
 b7a6839 file1 (Joe User 2015-03-26 17:21:41 -0500  9) # Insert here your local magic data. Format is described in magic(5).
 b7a6839 file1 (Joe User 2015-03-26 17:21:41 -0500 10) 
 ^36a1d7 file3 (Joe User 2015-03-26 17:19:10 -0500 11) PRETTY_NAME="Debian GNU/Linux 7 (wheezy)"
 ^36a1d7 file3 (Joe User 2015-03-26 17:19:10 -0500 12) NAME="Debian GNU/Linux"
 ^36a1d7 file3 (Joe User 2015-03-26 17:19:10 -0500 13) VERSION_ID="7"
 ^36a1d7 file3 (Joe User 2015-03-26 17:19:10 -0500 14) VERSION="7 (wheezy)"
 ^36a1d7 file3 (Joe User 2015-03-26 17:19:10 -0500 15) ID=debian

请注意，没有-C，git blame只是将新行归因于第二次提交。但是有了它，它会将最后 5 行归因file3于第一次提交，因为 1) 那是它们的来源，2) 段足够大，并且 3)file3在第二次提交中也被修改了。无法识别来自的行file2，因为虽然该段足够大，file2但在第二次提交中未修改。

另外，请注意 之间的区别-M，它检测文件内的内容移动，以及-C检测不同文件之间的移动/复制。

于 2015-03-26T18:04:01.413 回答