5

我正在尝试为 Phabricator 建立一个良好的工作流程,并且最近对我们的测试项目进行了一些更改以解决一些问题。我做了一些更改,但忘记将它们放在自己的功能分支中。所有更改都未提交给 git。我继续创建了适用于我所做的更改并提交它们的功能分支。我以为我可以切换到每个分支并arc diff为他们创建代码审查(我仍然认为我可以做到这一点)。但是,当我arc diff在当前签出的分支上执行时,该命令永远不会完成。为了看看发生了什么,我跑了arc diff --trace。输出如下。正如您所猜测的那样,它通过了提交消息规范(在我的情况下是通过 Notepad++),然后完全死在[26] git diff线(我所说的“死”是指它挂起并且永远不会完成)。

libphutil loaded from 'S:\web\_arcanist\libphutil\src'.
arcanist loaded from 'S:\web\_arcanist\arcanist\src'.
Working Copy: Reading .arcconfig from "S:\web\_apollo\andreas\bonfire3/.arcconfi
g".
Working Copy: Path "S:\web\_apollo\andreas\bonfire3" is part of `git` working co
py "S:\web\_apollo\andreas\bonfire3".
Working Copy: Project root is at "S:\web\_apollo\andreas\bonfire3".
>>> [0] <conduit> conduit.connect() <bytes = 445>
>>> [1] <http> http://phabricator.mydomain.com/api/conduit.connect
<<< [1] <http> 1,086,426 us
<<< [0] <conduit> 1,089,191 us
>>> [2] <exec> $ git diff --no-ext-diff --no-textconv --raw "HEAD" --
>>> [3] <exec> $ git ls-files --others --exclude-standard
>>> [4] <exec> $ git diff-files --name-only
<<< [3] <exec> 56,380 us
<<< [2] <exec> 84,804 us
<<< [4] <exec> 60,751 us
>>> [5] <event> diff.didCollectChanges <listeners = 0>
<<< [5] <event> 744 us
>>> [6] <exec> $ git rev-parse --verify HEAD^
<<< [6] <exec> 44,265 us
>>> [7] <exec> $ git rev-parse --abbrev-ref --symbolic-full-name '@{upstream}'
<<< [7] <exec> 75,134 us
>>> [8] <exec> $ git rev-parse --git-dir
<<< [8] <exec> 63,179 us
>>> [9] <exec> $ git cat-file -t "origin/master"
<<< [9] <exec> 35,771 us
>>> [10] <exec> $ git merge-base "origin/master" HEAD
<<< [10] <exec> 70,249 us
>>> [11] <exec> $ git log --first-parent --format=medium "91098728f2d669d8c1ce96
c2ba84059b57241fb6"..HEAD
<<< [11] <exec> 59,466 us
>>> [12] <exec> $ git log "HEAD" --not "91098728f2d669d8c1ce96c2ba84059b57241fb6
" --format=%H%x01%T%x01%P%x01%at%x01%an%x01%aE%x01%s%x01%s%n%n%b%x02 --
<<< [12] <exec> 57,813 us
>>> [13] <conduit> differential.query() <bytes = 415>
>>> [14] <http> http://phabricator.mydomain.com/api/differential.query
<<< [14] <http> 136,410 us
<<< [13] <conduit> 139,261 us
You have a saved revision message in '.git\arc\create-message'.
Message begins:

       Installed DBV

You can use this message, or discard it.

    Do you want to use this message? [Y/n] y

>>> [15] <exec> $ git log "HEAD" --not "91098728f2d669d8c1ce96c2ba84059b57241fb6
" --format=%H%x01%T%x01%P%x01%at%x01%an%x01%aE%x01%s%x01%s%n%n%b%x02 --
<<< [15] <exec> 40,860 us
>>> [16] <conduit> differential.parsecommitmessage() <bytes = 356>
>>> [17] <http> http://phabricator.mydomain.com/api/differential.parsecommitmessa
ge
<<< [17] <http> 154,222 us
<<< [16] <conduit> 155,662 us
>>> [18] <event> diff.willBuildMessage <listeners = 0>
<<< [18] <event> 556 us
>>> [19] <exec> $ git branch --no-color
<<< [19] <exec> 60,581 us
>>> [20] <exec> $ "C:\Program Files (x86)\Notepad++\notepad++.exe" -multiInst -n
osession  "C:\Users\andreas\AppData\Local\Temp\2\edit.6y1tzwocr1ookc0c\new-commi
t"
<<< [20] <exec> 2,583,272 us
>>> [21] <conduit> differential.parsecommitmessage() <bytes = 434>
>>> [22] <http> http://phabricator.mydomain.com/api/differential.parsecommitmessa
ge
<<< [22] <http> 156,039 us
<<< [21] <conduit> 158,955 us
>>> [23] <conduit> user.query() <bytes = 254>
>>> [24] <http> http://phabricator.mydomain.com/api/user.query
<<< [24] <http> 101,262 us
<<< [23] <conduit> 103,793 us
>>> [25] <event> diff.didBuildMessage <listeners = 0>
<<< [25] <event> 1,169 us
Linting...
No lint engine configured for this project.
Running unit tests...
No unit test engine is configured for this project.
>>> [26] <exec> $ git diff --no-ext-diff --no-textconv --no-color --src-prefix=a
/ --dst-prefix=b/ -U32767 -M -C "91098728f2d669d8c1ce96c2ba84059b57241fb6" --

我试过将git diff命令复制到一个单独的终端,它工作正常。我假设 PHP 的exec命令在本地可能有问题,所以我创建了一个快速的 2 行 PHP 文件来运行git diff命令……工作正常。我已经让该arc diff命令在该行运行了几个小时,但它没有完成。关于如何解决这个问题的任何想法?

更新 我忘了提到arc diff也挂在 a 上git commit --amend

4

2 回答 2

5

我有同样的问题。我进行了调试,发现原因是在“git diff”执行期间出现警告消息“LF 将被 CRLF 替换。”。我做了“git config core.safecrlf false”,这解决了问题。

于 2015-02-27T17:48:38.467 回答
0

虽然@summerwind 的答案有效。删除导致 的文件可能更安全LF will be replaced by CRLF,然后将它们检出。

:: del /s/q/f will deiete the .git folder, so you must specify the folder explicity
del /s/q/f <some-folder>
git checkout <some-folder>

或者

# actually it is just good practice
rm -rfv <some-folder>
git checkout <some-folder>
于 2016-01-27T16:20:40.013 回答