From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753245AbdBGI1L (ORCPT <rfc822;w@1wt.eu>);
        Tue, 7 Feb 2017 03:27:11 -0500
Received: from mail-it0-f66.google.com ([209.85.214.66]:33355 "EHLO
        mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753201AbdBGI1J (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 7 Feb 2017 03:27:09 -0500
MIME-Version: 1.0
In-Reply-To: <20170207081321.GA28595@gmail.com>
References: <1486387772-18837-1-git-send-email-mingo@kernel.org>
 <1486387772-18837-58-git-send-email-mingo@kernel.org> <CA+55aFzfiW-BrUD4fD-1H=oxTnTXNbFJEvo+kHvPgXqaVOnExA@mail.gmail.com>
 <20170206215458.GD9788@gmail.com> <CAMuHMdXH6OkkgKDxSRqKh=JK9rJ6HjtuWOAyCr888GUGZKKu_g@mail.gmail.com>
 <20170207081321.GA28595@gmail.com>
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 7 Feb 2017 09:27:07 +0100
X-Google-Sender-Auth: dqiAVTRJzVdcB6EaiYfP5qyWXVE
Message-ID: <CAMuHMdXUagF55zC3Y=fN7USK0N7t=sS4g+eB6+uNAi_EJa87zQ@mail.gmail.com>
Subject: Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out
 of <linux/sched.h>
To: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Galbraith <efault@gmx.de>, Oleg Nesterov <oleg@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Ingo,

On Tue, Feb 7, 2017 at 9:13 AM, Ingo Molnar <mingo@kernel.org> wrote:
> * Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> On Mon, Feb 6, 2017 at 10:54 PM, Ingo Molnar <mingo@kernel.org> wrote:
>> > Wondering why Git allowed me to be so stupid with those leftover merge markers.
>> > Git usually doesn't even allow me to commit them so I have these tuned out as a
>> > possibility. This was just a regular git rebase -i flow, to back-merge fixes and
>> > reorder/squash patches - nothing fancy that I remember - only the occasional
>> > --onto option. I'm using Git 2.7.4.
>>
>> Git complains about the merge conflicts, and refuses to commit the result
>> as long as you haven't resolved them, but it will happily commit everything
>> you add using "git add -u", incl. merge markers.
>
> Hm, it should really force that via 'git add -f' or such. The merge markers are
> _very_ infrequent as naturally occuring source code lines even on a per line basis
> - and especially the combination of them should be exceedingly unique.

They were very infrequent, until we switched to RST for documentation,
causing false positives when searching for "^[<=>].*" in vim...

> I frequently use:
>
>         git add $(git ls-files -m)

That's identical to "git add -u", right?

> ... to stage edits without comitting them, probably that workflow is what caused
> this bug.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds