Postgres Pro
Downloads
Home   >   mailing lists

Thread: Git diff patch in context diff format

Git diff patch in context diff format

From
Qi Huang
Date:
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? 
   Thanks.

Best Regards
Huang Qi Victor
Computer Science of National University of Singapore

Re: Git diff patch in context diff format

From
Robert Haas
Date:
On Fri, Aug 3, 2012 at 2:56 AM, Qi Huang <huangqiyx@outlook.com> 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

Re: Git diff patch in context diff format

From
Qi Huang
Date:
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 Regards
Huang Qi Victor
Computer 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: robertmhaas@gmail.com
> To: huangqiyx@outlook.com
> CC: pgsql-hackers@postgresql.org
>
> On Fri, Aug 3, 2012 at 2:56 AM, Qi Huang <huangqiyx@outlook.com> 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