Mason wrote:
I was planning to write 'git diff -q commit^ commit'
to test for empty commits. Looks like I'll be needing
'git diff commit^ commit | wc -l' instead?
I wrote a script to generate the list of empty commits.
git log --format="%h" --reverse 413cb08.. | while read H
do
if git diff
Mason writes:
>> Mason wrote:
>>
>>> I was planning to write 'git diff -q commit^ commit'
>>> to test for empty commits.
>>
>> s/-q/--quiet/ and all is well, no?
>
> Doh! I've no idea how I missed these...
Yeah, this is one of the unfortunate corners of Git that I can
apologize but cannot do m
Junio C Hamano wrote:
> Mason wrote:
>
>> I was planning to write 'git diff -q commit^ commit'
>> to test for empty commits.
>
> s/-q/--quiet/ and all is well, no?
Doh! I've no idea how I missed these...
--exit-code
Make the program exit with codes similar to diff(1). That is, it
exits wit
Mason writes:
>> Not just passing
>> these options, the code in "git am" to react to the result of patch
>> application to avoid the issue you observed when these options are
>> passed need to be adjusted by changes that started passing them, but
>> I do not think they did, cf. 77e9e496 (am: pass
Junio C Hamano wrote:
> Mason wrote:
>
>> I fetched linux-stable.git inside our repo.
>> I created ~300 patches using git format-patch -1 in a loop.
>> I can now run 'git am --3way $IGNORE *.patch'
>>
>> IGNORE is used to --exclude the directories I'm not interested in.
>>
>> Note: it seems --exc
Mason writes:
> Thanks! At least now, I see the light at the end of the tunnel.
>
> I fetched linux-stable.git inside our repo.
> I created ~300 patches using git format-patch -1 in a loop.
> I can now run 'git am --3way $IGNORE *.patch'
>
> IGNORE is used to --exclude the directories I'm not int
Junio C Hamano wrote:
But I personally think "git am -3" may be easier to handle.
Thanks! At least now, I see the light at the end of the tunnel.
I fetched linux-stable.git inside our repo.
I created ~300 patches using git format-patch -1 in a loop.
I can now run 'git am --3way $IGNORE *.patc
Mason writes:
> But 'git am' just gave up. Small sample of errors:
>
> error: patch failed: drivers/block/Kconfig:411
> error: drivers/block/Kconfig: patch does not apply
> error: drivers/tty/serial/8250/8250.c: does not exist in index
> error: patch failed: drivers/tty/serial/8250/8250_early.c:1
Hello everyone,
Here's the situation:
Back in 2012, we cloned a MIPS repo, which was itself a clone of
a 3.4.2 kernel with ~40 MIPS-specific patches applied.
Then the devs started pushing patches; and once in a while, the
maintainer would "sync" with the mainline kernel. I don't know
what tool
9 matches
Mail list logo
