Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-06 Thread Malahal Naineni
>> Much easier to edit the textual patch visually, then git am. I never manually edited patches! I use "git mergetool" after a rebase failure which brings up vim in 4 windows. Then it is a matter of editing a file in vim with all your usual vim commands. I know, it is important to know one 'workf

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-05 Thread William Allen Simpson
On 6/3/17 3:56 PM, Malahal Naineni wrote: I don't understand why you need to keep patches when git gives you the power to store your code in its own branches/stashes. Arguably, git commits have more information than a simple patch diff. That's why I use git format-patch. The default directory

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-05 Thread William Allen Simpson
On 6/2/17 12:19 PM, Niels de Vos wrote: On Fri, Jun 02, 2017 at 10:48:45AM -0400, Daniel Gryniewicz wrote: https://github.com/nfs-ganesha/ntirpc/pull/49 I'd already found that. Log wasn't very helpful. In fact, seemed wrong. There's no good reason to change the practices for all upstreams f

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-03 Thread Malahal Naineni
I don't understand why you need to keep patches when git gives you the power to store your code in its own branches/stashes. Arguably, git commits have more information than a simple patch diff. On Fri, Jun 2, 2017 at 9:49 PM, Niels de Vos wrote: > On Fri, Jun 02, 2017 at 10:48:45AM -0400, Danie

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-02 Thread Niels de Vos
On Fri, Jun 02, 2017 at 10:48:45AM -0400, Daniel Gryniewicz wrote: > https://github.com/nfs-ganesha/ntirpc/pull/49 The nfs-ganesha .gitignore was improved to only un-ignore patches in the debian packaging directory. It would have been good to apply that same logic to ntirpc: https://review.gerri

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-02 Thread Daniel Gryniewicz
Oh, and for the record, you can put a .gitignore in your home directory with *.patch in it, and ignore all patches on all projects. Daniel On 06/02/2017 10:48 AM, Daniel Gryniewicz wrote: https://github.com/nfs-ganesha/ntirpc/pull/49 Daniel On 06/02/2017 09:40 AM, William Allen Simpson wrote

Re: [Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-02 Thread Daniel Gryniewicz
https://github.com/nfs-ganesha/ntirpc/pull/49 Daniel On 06/02/2017 09:40 AM, William Allen Simpson wrote: Just updated my ntirpc, and suddenly my git commit -a and such are listing my patch files (in red). What the heck? Why this change? Since I've got a lot of outstanding patches in various

[Nfs-ganesha-devel] ntirpc v1.5.2 .gitignore patch

2017-06-02 Thread William Allen Simpson
Just updated my ntirpc, and suddenly my git commit -a and such are listing my patch files (in red). What the heck? Why this change? Since I've got a lot of outstanding patches in various stages of progress, this is really a terrible inconvenience. Worse than an inconvenience, as changing branc