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 S1753658AbdBGJpm (ORCPT <rfc822;w@1wt.eu>);
        Tue, 7 Feb 2017 04:45:42 -0500
Received: from mail-wj0-f196.google.com ([209.85.210.196]:32805 "EHLO
        mail-wj0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753079AbdBGJph (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 7 Feb 2017 04:45:37 -0500
Date: Tue, 7 Feb 2017 10:45:32 +0100
From: Ingo Molnar <mingo@kernel.org>
To: Geert Uytterhoeven <geert@linux-m68k.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>
Subject: Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out
 of <linux/sched.h>
Message-ID: <20170207094532.GB9829@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>
 <CAMuHMdXUagF55zC3Y=fN7USK0N7t=sS4g+eB6+uNAi_EJa87zQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAMuHMdXUagF55zC3Y=fN7USK0N7t=sS4g+eB6+uNAi_EJa87zQ@mail.gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 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...

But the exact merge conflict pattern is generated by Git, and it's far more 
specific than the "^[<=>].*" pattern, right?

So it should be possible to disambiguate?

> > I frequently use:
> >
> >         git add $(git ls-files -m)
> 
> That's identical to "git add -u", right?

Indeed, I'm bad at remembering one letter shortcuts: why is what is '-m' in 
git-ls-files called '-u' in git-add? ;-)

BTW., would 'git add -u' have prevented my mistake?

Thanks,

	Ingo