Tin*_*per 6 git perforce git-p4
我尝试在一个repo上运行git p4 submit,我一直在运行它作为git和perforce之间的临时桥梁.多人使用repo作为遥控器,并定期将其提交回perforce.
除了一些重复的perforce提交之外,它一直很好地工作,其奇怪的行为我似乎无法再现.然后有一天,我得到了这个错误.我不能再将任何git提交到perforce.
user@hostname:~/Source/code$ git p4 submit -M --export-labels
Perforce checkout for depot path //depot/perforce/workspace/ located at /home/user/Source/git-p4-area/perforce/workspace/
Synchronizing p4 checkout...
... - file(s) up-to-date.
Applying ffa390f comments in config xml files
//depot/perforce/workspace/sub/folder/structure/first.xml#3 - opened for edit
//depot/perforce/workspace/sub/folder/structure/second.xml#3 - opened for edit
//depot/perforce/workspace/sub/folder/structure/third.xml#3 - opened for edit
//depot/perforce/workspace/sub/folder/structure/forth.xml#3 - opened for edit
//depot/perforce/workspace/sub/folder/structure/fifth.xml#1 - opened for edit
error: patch failed: sub/folder/structure/first.xml:1
error: sub/folder/structure/first.xml: patch does not apply
error: patch failed: sub/folder/structure/second.xml:1
error: sub/folder/structure/second.xml: patch does not apply
error: patch failed: sub/folder/structure/third.xml:1
error: sub/folder/structure/third.xml: patch does not apply
error: patch failed: sub/folder/structure/forth.xml:1
error: sub/folder/structure/forth.xml: patch does not apply
error: patch failed: sub/folder/structure/fifth.xml:1
error: sub/folder/structure/fifth.xml: patch does not apply
Unfortunately applying the change failed!
//depot/perforce/workspace/sub/folder/structure/first.xml#1 - was edit, reverted
//depot/perforce/workspace/sub/folder/structure/second.xml#3 - was edit, reverted
//depot/perforce/workspace/sub/folder/structure/third.xml#3 - was edit, reverted
//depot/perforce/workspace/sub/folder/structure/forth.xml#3 - was edit, reverted
//depot/perforce/workspace/sub/folder/structure/fifth.xml#3 - was edit, reverted
No commits applied.
该错误看起来很像这个错误:
除了我没有做任何关键字替换,所以我不知道它可能是什么.添加--verbose似乎没有多大帮助解释(我手头没有那个命令输出)
我能想象的唯一变化是我在提交时添加了一个.gitattributes文件,其中包含以下内容.但是,当gitattributes文件到位时,在此提交之前进行的提交确实有效,因此它不可能(我已经使.gitattributes文件更加详细)
* text eol=lf
我已尝试在此违规提交之前回滚此远程仓库中的提交,然后将其从我的仓库中复制到此远程仓库,然后重新提交.相同的行为.我尝试回滚,对同一个文件进行不同的编辑,重新推送,重新提交.相同的行为.它似乎只发生在这些文件中.由于回滚,我尝试对其他文件进行编辑,然后才能工作.我尝试运行dos2unix强制unix行结束违规文件,这也没有修复它.
什么命令可以让我更好地解释这里发生了什么？有没有我可以尾随的git日志文件？任何援助将不胜感激.
编辑:我已经使用.gitattributes文件重新测试了我的问题.没有任何区别.目前我的全局core.autocrlf设置是输入.但是缺少.gitattributes文件似乎没有任何区别.这是我刚刚--verbose打开一个有问题的文件重新测试它时的样子.
user@hostname:/code$ git p4 submit -M --export-labels --verbose
Reading pipe: git name-rev HEAD
Reading pipe: ['git', 'config', 'git-p4.allowSubmit']
Reading pipe: git rev-parse --symbolic --remotes
Reading pipe: git rev-parse p4/master
Reading pipe: git cat-file commit 0457c7589ea679dcc0c9114b34f8f30bc2ee08cf
Reading pipe: git cat-file commit HEAD~0
Reading pipe: git cat-file commit HEAD~1
Reading pipe: ['git', 'config', 'git-p4.conflict']
Origin branch is remotes/p4/master
Reading pipe: ['git', 'config', '--bool', 'git-p4.useclientspec']
Opening pipe: ['p4', '-G', 'where', '//depot/perforce/workspace/...']
Perforce checkout for depot path //depot/perforce/workspace/ located at /home/user/Source/git-p4-area/perforce/workspace/
Synchronizing p4 checkout...
... - file(s) up-to-date.
Opening pipe: p4 -G opened ...
Reading pipe: ['git', 'rev-list', '--no-merges', 'remotes/p4/master..master']
Reading pipe: ['git', 'config', '--bool', 'git-p4.skipUserNameCheck']
Reading pipe: ['git', 'config', 'git-p4.detectCopies']
Reading pipe: ['git', 'config', '--bool', 'git-p4.detectCopiesHarder']
Reading pipe: ['git', 'show', '-s', '--format=format:%h %s', 'ef3b95f5fec193fe2612b28e2e3b5e7f8ba9419e']
Applying ef3b95f making test change
Opening pipe: p4 -G users
Reading pipe: ['git', 'log', '--max-count=1', '--format=%ae', 'ef3b95f5fec193fe2612b28e2e3b5e7f8ba9419e']
Reading pipe: git diff-tree -r -M "ef3b95f5fec193fe2612b28e2e3b5e7f8ba9419e^" "ef3b95f5fec193fe2612b28e2e3b5e7f8ba9419e"
//depot/perforce/workspace/sub/folder/structure/first.xml#3 - opened for edit
<stdin>:17: trailing whitespace.
<!-- comment line 1 -->
<stdin>:18: trailing whitespace.
<!-- comment line 2 -->
<stdin>:19: trailing whitespace.
<!-- comment line 3 -->
error: patch failed: sub/folder/structure/first.xml:1
error: sub/folder/structure/first.xml: patch does not apply
Unfortunately applying the change failed!
Reading pipe: ['git', 'config', '--bool', 'git-p4.attemptRCSCleanup']
//depot/perforce/workspace/sub/folder/structure/first.xml#3 - was edit, reverted
No commits applied.
Reading pipe: ['git', 'config', '--bool', 'git-p4.exportLabels']
Opening pipe: ['p4', '-G', 'labels', '//depot/ipstor.maple/automation/...']
Reading pipe: ['git', 'tag']
Reading pipe: ['git', 'config', 'git-p4.labelExportRegexp']
我想到了。该问题是由行结尾引起的。我使用不同的文件重新测试了该问题，在这种情况下，错误是由于在 perforce 工作区中检出的文件的行结尾是 win 风格的 crlf 以及 git 存储库中的文件的行结尾是 unix 风格引起的如果。
在这种情况下，我在 perforce 中检查了该文件，对其运行 dos2unix 并提交，然后运行 git p4 Submit 并且它起作用了。
这不是真正的解决方案。这只是解决方法。我向 git 的邮件列表发送了一封电子邮件，请求修复。http://marc.info/?l=git&m=136630231402536&w=2