On Sat, May 6, 2017 at 12:06 PM, Russell King - ARM Linux
<linux@xxxxxxxxxxxxxxx> wrote:
> On Sat, May 06, 2017 at 11:45:13AM +0200, Arnd Bergmann wrote:
>> On Fri, May 5, 2017 at 9:47 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>>
>> > @@ -164,7 +158,11 @@ __after_proc_init:
>> > #endif
>> > mcr p15, 0, r0, c1, c0, 0 @ write control reg
>> > #endif /* CONFIG_CPU_CP15 */
>> > +<<<<<<< HEAD
>> > mov pc, r13
>> > +=======
>> > + ret lr
>> > +>>>>>>> 12ebe5ca67dc... ARM: 8383/1: nommu: avoid deprecated source register on mov
>> > ENDPROC(__after_proc_init)
>> > .ltorg
>> >
>>
>> This was evidently crap, please ignore this patch.
>
> Maybe a commit hook that checks the files to be committed for unresolved
> conflicts may help avoid this? Maybe something like this (untested) in
> .git/hooks/pre-commit?
>
> #!/bin/sh
> if git diff-index -u HEAD | grep -nv '^\+\(<<<<<<<\|=======\|>>>>>>>\)'; then
> echo "Your files appear to contain unresolved merges, please fix," >&2
> echo "or override with git commit --no-verify" >&2
> exit 1
> fi
Good idea. It was almost right, 'grep -q' (without -v) did it, and I've
added that now. Thanks,
Arnd