Re: [HACKERS] Git diff patch in context diff format

2012-08-08 Thread Qi Huang
> Date: Wed, 8 Aug 2012 15:05:06 -0400
> From: and...@dunslane.net
> To: br...@momjian.us
> CC: huangq...@outlook.com; pgsql-hackers@postgresql.org
> Subject: Re: [HACKERS] Git diff patch in context diff format
> 
> 
> On 08/08/2012 01:29 PM, Bruce Momjian wrote:
> > On Thu, Aug  2, 2012 at 05:03:04PM +0800, Qi Huang wrote:
> >> Hi, hackers
> >>  I was exporting my project to a patch file. As the patch review 
> >> requires,
> >> the patch needs to be in context diff format 
> >> (http://wiki.postgresql.org/wiki/
> >> Reviewing_a_Patch). But the git diff exports in a format similar to unified
> >> format. What is everyone doing with patching now? Is there any standard 
> >> way?
> > Have you read our wiki about git and diffs?
> >
> > http://wiki.postgresql.org/wiki/Working_with_Git#Context_diffs_with_Git
> 
> 
> 
> I must confess that, like Robert, I just use:
> 
> git diff | filterdiff --format=context
> 
> I tried the git config stuff mentioned on the wiki, and it bit me a few 
> times, I forget exactly how, and this just works without hassle.
> 
> cheers
> 
> andrew
> 
> 
> -- 
> Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgsql-hackers

I'm sorry, but actually this issue has already been resolved. I don't why the 
system sent another mail... Thanks for your response.

Best RegardsHuang Qi VictorComputer Science of National University of Singapore
  

Re: [HACKERS] Git diff patch in context diff format

2012-08-08 Thread Andrew Dunstan


On 08/08/2012 01:29 PM, Bruce Momjian wrote:

On Thu, Aug  2, 2012 at 05:03:04PM +0800, Qi Huang wrote:

Hi, hackers
 I was exporting my project to a patch file. As the patch review requires,
the patch needs to be in context diff format (http://wiki.postgresql.org/wiki/
Reviewing_a_Patch). But the git diff exports in a format similar to unified
format. What is everyone doing with patching now? Is there any standard way?

Have you read our wiki about git and diffs?

http://wiki.postgresql.org/wiki/Working_with_Git#Context_diffs_with_Git




I must confess that, like Robert, I just use:

   git diff | filterdiff --format=context

I tried the git config stuff mentioned on the wiki, and it bit me a few 
times, I forget exactly how, and this just works without hassle.


cheers

andrew


--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers


Re: [HACKERS] Git diff patch in context diff format

2012-08-08 Thread Bruce Momjian
On Thu, Aug  2, 2012 at 05:03:04PM +0800, Qi Huang wrote:
> Hi, hackers
> I was exporting my project to a patch file. As the patch review requires,
> the patch needs to be in context diff format (http://wiki.postgresql.org/wiki/
> Reviewing_a_Patch). But the git diff exports in a format similar to unified
> format. What is everyone doing with patching now? Is there any standard way? 

Have you read our wiki about git and diffs?

http://wiki.postgresql.org/wiki/Working_with_Git#Context_diffs_with_Git


-- 
  Bruce Momjian  http://momjian.us
  EnterpriseDB http://enterprisedb.com

  + It's impossible for everything to be true. +

-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers


[HACKERS] Git diff patch in context diff format

2012-08-07 Thread Qi Huang
Hi, hackersI was exporting my project to a patch file. As the patch review 
requires, the patch needs to be in context diff format 
(http://wiki.postgresql.org/wiki/Reviewing_a_Patch). But the git diff exports 
in a format similar to unified format. What is everyone doing with patching 
now? Is there any standard way?Thanks.

Best RegardsHuang Qi VictorComputer Science of National University of Singapore 
  

Re: [HACKERS] Git diff patch in context diff format

2012-08-03 Thread Qi Huang
Thanks for your suggestion, Robert.I just found this page 
(http://wiki.postgresql.org/wiki/Working_with_Git#Context_diffs_with_Git), 
quite useful and powerful. 
Best RegardsHuang Qi VictorComputer Science of National University of Singapore

> Date: Fri, 3 Aug 2012 04:28:42 -0400
> Subject: Re: [HACKERS] Git diff patch in context diff format
> From: robertmh...@gmail.com
> To: huangq...@outlook.com
> CC: pgsql-hackers@postgresql.org
> 
> On Fri, Aug 3, 2012 at 2:56 AM, Qi Huang  wrote:
> > Hi, hackers
> > I was exporting my project to a patch file. As the patch review
> > requires, the patch needs to be in context diff format
> > (http://wiki.postgresql.org/wiki/Reviewing_a_Patch). But the git diff
> > exports in a format similar to unified format. What is everyone doing with
> > patching currently? Is there any standard way?
> 
> When I want a context diff, I just do:
> 
> git diff | filterdiff --format=context
> 
> -- 
> Robert Haas
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
> 
> -- 
> Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgsql-hackers
  

Re: [HACKERS] Git diff patch in context diff format

2012-08-03 Thread Robert Haas
On Fri, Aug 3, 2012 at 2:56 AM, Qi Huang  wrote:
> Hi, hackers
> I was exporting my project to a patch file. As the patch review
> requires, the patch needs to be in context diff format
> (http://wiki.postgresql.org/wiki/Reviewing_a_Patch). But the git diff
> exports in a format similar to unified format. What is everyone doing with
> patching currently? Is there any standard way?

When I want a context diff, I just do:

git diff | filterdiff --format=context

-- 
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers


[HACKERS] Git diff patch in context diff format

2012-08-02 Thread Qi Huang



Hi, hackersI was exporting my project to a patch file. As the patch review 
requires, the patch needs to be in context diff format 
(http://wiki.postgresql.org/wiki/Reviewing_a_Patch). But the git diff exports 
in a format similar to unified format. What is everyone doing with patching 
currently? Is there any standard way?Thanks.

Best RegardsHuang Qi VictorComputer Science of National University of Singapore