[llvm-dev] 'git llvm push' not working for me on Windows

Mikhail Ramalho via llvm-dev
2018-11-28T16:40:25Z

Hi,

The patch only changes one file in clang. Here's the patch:
https://reviews.llvm.org/D54974

Attached the log. It seems to complain about the git apply -p2.

Maybe it's something related to arc?

Em qua, 28 de nov de 2018 às 15:37, James Y Knight <jyknight at
google.com>
escreveu:

> Can you please run "git llvm --verbose push" and send me the
output?
>
> BTW, I've just committed a fix for the handling of binary patch data
when
> you're running it under python3.X. I don't believe that was a
regression
> from my recent changes, but if you're using python3, you could see if
that
> fixes it for you.
>
> On Tue, Nov 27, 2018 at 7:20 PM Mikhail Ramalho via llvm-dev <
> llvm-dev at lists.llvm.org> wrote:
>
>> I'm facing this now on Linux.
>>
>> Any idea how to fix it?
>>
>> Em seg, 26 de nov de 2018 às 20:22, via llvm-dev <llvm-dev at
lists.llvm.org>
>> escreveu:
>>
>>> I've verified that none of the files I tried to check in had
>>> Windows-style line endings. It's something else.
>>>
>>> --paulr
>>>
>>>
>>>
>>> *From:* vsk at apple.com [mailto:vsk at apple.com] *On Behalf Of
*Vedant Kumar
>>> *Sent:* Thursday, November 22, 2018 9:38 AM
>>> *To:* Robinson, Paul
>>> *Cc:* zturner at google.com; jyknight at google.com; llvm-dev at
lists.llvm.org
>>> *Subject:* Re: [llvm-dev] 'git llvm push' not working for
me on Windows
>>>
>>>
>>>
>>> As a test case, try committing a change to
>>> clang/test/SemaCXX/sourceranges.cpp?
>>>
>>>
>>>
>>> I believe most editors force Windows-style line endings for that
file
>>> (they show up in my vim as “^M”). I recently tried to commit a
change to
>>> that file using “git llvm push” on macOS, but hit what I think is
the same
>>> issue. At least, the error message was the same.
>>>
>>> vedant (sent from my iPhone)
>>>
>>>
>>> On Nov 21, 2018, at 10:06 AM, via llvm-dev <llvm-dev at
lists.llvm.org>
>>> wrote:
>>>
>>> FTR the commit where it failed for me had both llvm and clang
changes.
>>> I wonder if that contributed.
>>>
>>> --paulr
>>>
>>>
>>>
>>> *From:* llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org
>>> <llvm-dev-bounces at lists.llvm.org>] *On Behalf Of *via
llvm-dev
>>> *Sent:* Monday, November 19, 2018 6:01 PM
>>> *To:* zturner at google.com; jyknight at google.com
>>> *Cc:* llvm-dev at lists.llvm.org
>>> *Subject:* Re: [llvm-dev] 'git llvm push' not working for
me on Windows
>>>
>>>
>>>
>>> Hm.  Just now it worked for me for r347271.  If it happens again
I'll
>>> try verbose mode and attach a log.
>>>
>>> Thanks,
>>>
>>> --paulr
>>>
>>>
>>>
>>> *From:* Zachary Turner [mailto:zturner at google.com <zturner at
google.com>]
>>> *Sent:* Monday, November 19, 2018 5:26 PM
>>> *To:* James Y Knight
>>> *Cc:* Robinson, Paul; llvm-dev
>>> *Subject:* Re: [llvm-dev] 'git llvm push' not working for
me on Windows
>>>
>>>
>>>
>>> Usually every time I've seen that error message, it's been
related to
>>> line ending normalization.  But James is right, I did use it
successfully
>>> this morning as well as yesterday.
>>>
>>>
>>>
>>> On Mon, Nov 19, 2018 at 1:03 PM James Y Knight via llvm-dev <
>>> llvm-dev at lists.llvm.org> wrote:
>>>
>>> It does sound like I must've broken something, but I believe
zturner
>>> used it on windows successfully. Perhaps you could help me debug
the issue?
>>> Possibly running it with --verbose would show something useful.
>>>
>>>
>>>
>>> On Mon, Nov 19, 2018 at 1:32 PM <paul.robinson at sony.com>
wrote:
>>>
>>> I am consistently getting:
>>>
>>> `git apply -p2 -` returned 1
>>> error: include/llvm/IR/DIBuilder.h: No such file or directory
>>> [[ etc ]]
>>> Patch doesn't apply; maybe you should try `git pull -r` first?
>>>
>>> My usual response to a problem from git-llvm (which is most often
>>> an anti-virus issue) is to blow away .git\llvm-upstream-svn but
>>> that doesn't help this time.
>>>
>>> I see James Knight did a "performance improvement" on
Friday,
>>> perhaps that doesn't work so well on Windows?  The main
>>> performance cost is one-time, and as long as my anti-virus
isn't
>>> trashing things behind my back the performance is just fine;
>>> so it's not clear this is really a necessary improvement.
>>> If it's interfering with developing the new git repo, then
I'd
>>> suggest making it optional or platform-dependent.
>>>
>>> As a workaround I fetched the previous version of git-llvm
>>> and put it earlier in my PATH, that worked.
>>>
>>> --paulr
>>>
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> llvm-dev at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> llvm-dev at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> llvm-dev at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>
>>
>> --
>>
>> Mikhail Ramalho.
>> _______________________________________________
>> LLVM Developers mailing list
>> llvm-dev at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
>

--

Mikhail Ramalho.
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20181128/ff3d69a8/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: out.log
Type: application/octet-stream
Size: 11351 bytes
Desc: not available
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20181128/ff3d69a8/attachment.obj>