From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Vladimir 'phcoder' Serbinenko" Subject: Re: [PATCH v2 1/6] gitignore: Ignore *.orig, *.rej and *.swp files Date: Wed, 4 Nov 2015 13:03:56 +0100 Message-ID: References: <1437402954-7375-1-git-send-email-daniel.kiper@oracle.com> <1437402954-7375-2-git-send-email-daniel.kiper@oracle.com> <1439370297.9747.318.camel@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1179225760277082783==" Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZtwnG-0006bk-Ar for xen-devel@lists.xenproject.org; Wed, 04 Nov 2015 12:03:58 +0000 Received: by wicfx6 with SMTP id fx6so87995812wic.1 for ; Wed, 04 Nov 2015 04:03:56 -0800 (PST) In-Reply-To: <1439370297.9747.318.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: jgross@suse.com, grub-devel@gnu.org, keir@xen.org, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.com, Daniel Kiper , roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, wei.liu2@citrix.com, xen-devel@lists.xenproject.org, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org List-Id: xen-devel@lists.xenproject.org --===============1179225760277082783== Content-Type: multipart/alternative; boundary=001a1130d26a07d09a0523b5ce20 --001a1130d26a07d09a0523b5ce20 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Le 12 ao=C3=BBt 2015 11:04 AM, "Ian Campbell" a = =C3=A9crit : > > > (Having written the below I see too late that this is a grub patch not a > Xen one, a tag in the subject for such cross posted patches would be useful > please. Anyway, my opinion counts for very little in this context but I > leave it below since already I wrote it. I notice that xen.git#.gitignore > _does_ list *.rej, which I think is wrong...) > > On Mon, 2015-07-20 at 16:35 +0200, Daniel Kiper wrote: > > Signed-off-by: Daniel Kiper > > At least *.rej and perhaps *.orig are indicative of a failed patch > application, I think I want them to appear in "git status". > > By way of comparison Linux's .gitignore includes *.orig but not *.rej and > Qemu's includes neither. > > So nack to the addition of *.rej from me. I'm more or less ambivalent about > *.orig. > I have to agree. You should clean up *.rej *.orig after fixing conflicts > > --- > > .gitignore | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/.gitignore b/.gitignore > > index 18ab8e8..6d25d39 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -147,6 +147,7 @@ mod-*.c > > missing > > netboot_test > > *.o > > +*.orig > > *.a > > ohci_test > > partmap_test > > @@ -160,9 +161,11 @@ po/stamp-po > > printf_test > > priority_queue_unit_test > > pseries_test > > +*.rej > > stamp-h > > stamp-h1 > > stamp-h.in > > +*.swp > > symlist.c > > symlist.h > > trigtables.c --001a1130d26a07d09a0523b5ce20 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Le=C2=A012 ao=C3=BBt 2015 11:04 AM, "Ian Campbell" <ian.campbell@citrix.com> a =C3=A9cr= it=C2=A0:
>
>
> (Having written the below I see too late that this is a grub patch not= a
> Xen one, a tag in the subject for such cross posted patches would be u= seful
> please. Anyway, my opinion counts for very little in this context but = I
> leave it below since already I wrote it. I notice that xen.git#.gitign= ore
> _does_ list *.rej, which I think is wrong...)
>
> On Mon, 2015-07-20 at 16:35 +0200, Daniel Kiper wrote:
> > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
>
> At least *.rej and perhaps *.orig are indicative of a failed patch
> application, I think I want them to appear in "git status".<= br> >
> By way of comparison Linux's .gitignore includes *.orig but not *.= rej and
> Qemu's includes neither.
>
> So nack to the addition of *.rej from me. I'm more or less ambival= ent about
> *.orig.
>
I have to agree. You should clean up *.rej *.orig after fixing conflicts > > ---
> >=C2=A0 .gitignore |=C2=A0 =C2=A0 3 +++
> >=C2=A0 1 file changed, 3 insertions(+)
> >
> > diff --git a/.gitignore b/.gitignore
> > index 18ab8e8..6d25d39 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -147,6 +147,7 @@ mod-*.c
> >=C2=A0 missing
> >=C2=A0 netboot_test
> >=C2=A0 *.o
> > +*.orig
> >=C2=A0 *.a
> >=C2=A0 ohci_test
> >=C2=A0 partmap_test
> > @@ -160,9 +161,11 @@ po/stamp-po
> >=C2=A0 printf_test
> >=C2=A0 priority_queue_unit_test
> >=C2=A0 pseries_test
> > +*.rej
> >=C2=A0 stamp-h
> >=C2=A0 stamp-h1
> >=C2=A0 stamp-h.in
> > +*.swp
> >=C2=A0 symlist.c
> >=C2=A0 symlist.h
> >=C2=A0 trigtables.c

--001a1130d26a07d09a0523b5ce20-- --===============1179225760277082783== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1179225760277082783==--