[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH v2 1/6] gitignore: Ignore *.orig, *.rej and *.swp files
- To: Ian Campbell <ian.campbell@xxxxxxxxxx>
- From: "Vladimir 'phcoder' Serbinenko" <phcoder@xxxxxxxxx>
- Date: Wed, 4 Nov 2015 13:03:56 +0100
- Cc: jgross@xxxxxxxx, grub-devel@xxxxxxx, keir@xxxxxxx, stefano.stabellini@xxxxxxxxxxxxx, andrew.cooper3@xxxxxxxxxx, Daniel Kiper <daniel.kiper@xxxxxxxxxx>, roy.franz@xxxxxxxxxx, ning.sun@xxxxxxxxx, david.vrabel@xxxxxxxxxx, jbeulich@xxxxxxxx, wei.liu2@xxxxxxxxxx, xen-devel@xxxxxxxxxxxxxxxxxxxx, qiaowei.ren@xxxxxxxxx, richard.l.maliszewski@xxxxxxxxx, gang.wei@xxxxxxxxx, fu.wei@xxxxxxxxxx
- Delivery-date: Wed, 04 Nov 2015 12:03:59 +0000
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
LeÂ12 aoÃt 2015 11:04 AM, "Ian Campbell" <ian.campbell@xxxxxxxxxx> a ÃcritÂ:
>
>
> (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 <daniel.kiper@xxxxxxxxxx>
>
> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
