1

上个月,我开始通过 fork 相应的 repo、创建功能分支然后提交拉取请求来为 GitHub 存储库做出贡献。在重复该过程几天后,我在使用预安装的 Linux 命令mv和 Git 命令重命名文件时遇到了一个奇怪的问题git mv

实际的问题是,这取决于您何时使用 移动/重命名文件git mv、何时git add以及何时编辑重命名的文件,您将获得:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        renamed:    somethingelse -> something

或这个:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   something
        deleted:    somethingelse

为了证明这一点,我写了一个测试

#!/bin/bash

# To my knowledge, this “problem” only occurs with new files in a Git repo
printf "COMMAND: mkdir -v gitrepo\n\n"
mkdir -v gitrepo

printf "\nCOMMAND: cd gitrepo\n\n"
cd gitrepo

printf "\nCOMMAND: git init\n\n"
git init

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: touch something\n\n"
touch something

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: git add something\n\n"
git add something

printf "\nCOMMAND: git status\n\n"
git status

printf '\nCOMMAND: git commit -m "Added something"\n\n'
git commit -m "Added something"

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: git mv something somethingelse\n\n"
git mv something somethingelse

printf "\nCOMMAND: git status\n\n"
git status

# Type in the following on line 1: First line of code
printf "\nCOMMAND: vim somethingelse\n\n"
vim somethingelse

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: git add somethingelse\n\n"
git add somethingelse

printf "\nCOMMAND: git status\n\n"
git status

printf '\nCOMMAND: git commit -m "Renamed something to somethingelse and edited somethingelse"\n\n'
git commit -m "Renamed something to somethingelse and edited somethingelse"

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: git mv somethingelse something\n\n"
git mv somethingelse something

printf "\nCOMMAND: git status\n\n"
git status

# If you add something to the first line, the rename will not be detected by Git
# However, if you instead create 2 newlines and fill line 3 with new code,
# the rename gets detected for whatever reason
printf "\nCOMMAND: vim something\n\n"
vim something

printf "\nCOMMAND: git status\n\n"
git status

printf "\nCOMMAND: git add something\n\n"
git add something

printf "\nCOMMAND: git status\n\n"
git status

printf '\nCOMMAND: git commit -m "Renamed somethingelse to something and edited something"\n\n'
git commit -m "Renamed somethingelse to something and edited something"

printf "\nCOMMAND: git status\n\n"
git status

cd .. && rm -fr gitrepo && printf "\nREMOVED gitrepo folder\n"
printf "\nDONE.\n"

出于某种原因,这主要影响“新文件”,而不是存储库中已经存在的文件。例如,如果您克隆我的Spoon-Knife 存储库的分支,git clone https://github.com/christianheinrichs/Spoon-Knife.git然后应用链接测试脚本的工作流程,您将看到在大多数情况下,您将能够将 README.md 文件重命名为 README,例如,编辑它仍然算作重命名,而不是新文件/删除的拆分。

虽然我可以在克隆的 Spoon-Knife fork repo 上重现新文件/删除的行为,但我不确定我是如何做到的,当我说我试图弄清楚时相信我。

那么我不明白这里到底发生了什么?

见:https ://gist.github.com/christianheinrichs/e50bfdd5eec70a606fa6ce4a88c5951b#file-git_mv-test-sh-L65

4

1 回答 1

4

git不保留一个标志说“这个newname文件最初被称为oldname文件”:

git mv oldname newname

# is exactly equivalent to :  

mv oldname newname
git rm oldname
git add newname

在显示文件状态时,通过比较文件的内容并查看它们的相似程度,git尝试猜测它是 arename还是 a 。delete + add

所以:如果你从git mv一个文件开始,然后编辑该文件,这取决于文件被修改了多少,git 可能会也可能不会看到这一切都是以mv.

另请参阅此问题的答案:Git 如何知道该文件已重命名?

于 2017-09-15T07:01:06.877 回答