Re: git diff script is not portable

Lists: pgsql-hackers
From: Bruce Momjian <bruce(at)momjian(dot)us>
To: PostgreSQL-development <pgsql-hackers(at)postgreSQL(dot)org>
Subject: git diff script is not portable
Date: 2010-11-17 18:54:49
Message-ID: 201011171854.oAHIsnR18848@momjian.us
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

Looking here:

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

the script we recommend for doing context diffs for git,
git-external-diff, is not portable:

http://anarazel.de/pg/git-external-diff

It uses diff -L, which is not supported by FreeBSD, and I imagine many
other operating systems.

If we want people to use this to produce context diffs, we should
provide a portable script. I can modify it to be portable, but it is
currently hosted on some other site. How should I handle this? How
do I contact the author, or perhaps I should create a new on on
ftp.postgresql.org and link to that.

Comments?

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

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


From: Magnus Hagander <magnus(at)hagander(dot)net>
To: Bruce Momjian <bruce(at)momjian(dot)us>
Cc: PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: git diff script is not portable
Date: 2010-11-17 19:03:28
Message-ID: AANLkTinmp26+sbe0rL4XF1N70bWR16g7hzTTcx-3seKs@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce(at)momjian(dot)us> wrote:
> Looking here:
>
>        http://wiki.postgresql.org/wiki/Working_with_Git
>
> the script we recommend for doing context diffs for git,
> git-external-diff, is not portable:
>
>        http://anarazel.de/pg/git-external-diff
>
> It uses diff -L, which is not supported by FreeBSD, and I imagine many
> other operating systems.
>
> If we want people to use this to produce context diffs, we should
> provide a portable script.  I can modify it to be portable, but it is
> currently hosted on some other site.  How should I handle this?    How
> do I contact the author, or perhaps I should create a new on on
> ftp.postgresql.org and link to that.

Do it the git way - fork it and put it on your github page.

Or do it the pg way - fork it and put it in src/tools.

--
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/


From: Andres Freund <andres(at)anarazel(dot)de>
To: pgsql-hackers(at)postgresql(dot)org
Cc: Bruce Momjian <bruce(at)momjian(dot)us>
Subject: Re: git diff script is not portable
Date: 2010-11-17 19:06:46
Message-ID: 201011172006.47782.andres@anarazel.de
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

On Wednesday 17 November 2010 19:54:49 Bruce Momjian wrote:
> Looking here:
>
> http://wiki.postgresql.org/wiki/Working_with_Git
>
> the script we recommend for doing context diffs for git,
> git-external-diff, is not portable:
>
> http://anarazel.de/pg/git-external-diff
>
> It uses diff -L, which is not supported by FreeBSD, and I imagine many
> other operating systems.
>
> If we want people to use this to produce context diffs, we should
> provide a portable script. I can modify it to be portable, but it is
> currently hosted on some other site. How should I handle this? How
> do I contact the author, or perhaps I should create a new on on
> ftp.postgresql.org and link to that.
If you have changes I am happy to change the script - but hosting it a
*.postgresql.org domain might be a good idea anyway.

Andres


From: Bruce Momjian <bruce(at)momjian(dot)us>
To: Magnus Hagander <magnus(at)hagander(dot)net>
Cc: PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: git diff script is not portable
Date: 2010-11-17 19:49:36
Message-ID: 201011171949.oAHJnag10452@momjian.us
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

Magnus Hagander wrote:
> On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce(at)momjian(dot)us> wrote:
> > Looking here:
> >
> > ? ? ? ?http://wiki.postgresql.org/wiki/Working_with_Git
> >
> > the script we recommend for doing context diffs for git,
> > git-external-diff, is not portable:
> >
> > ? ? ? ?http://anarazel.de/pg/git-external-diff
> >
> > It uses diff -L, which is not supported by FreeBSD, and I imagine many
> > other operating systems.
> >
> > If we want people to use this to produce context diffs, we should
> > provide a portable script. ?I can modify it to be portable, but it is
> > currently hosted on some other site. ?How should I handle this? ? ?How
> > do I contact the author, or perhaps I should create a new on on
> > ftp.postgresql.org and link to that.
>
> Do it the git way - fork it and put it on your github page.
>
> Or do it the pg way - fork it and put it in src/tools.

src/tools is a very good idea. Objections?

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

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


From: Bruce Momjian <bruce(at)momjian(dot)us>
To: Bruce Momjian <bruce(at)momjian(dot)us>
Cc: Magnus Hagander <magnus(at)hagander(dot)net>, PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: git diff script is not portable
Date: 2011-03-10 23:13:17
Message-ID: 201103102313.p2ANDHb20199@momjian.us
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

Bruce Momjian wrote:
> Magnus Hagander wrote:
> > On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce(at)momjian(dot)us> wrote:
> > > Looking here:
> > >
> > > ? ? ? ?http://wiki.postgresql.org/wiki/Working_with_Git
> > >
> > > the script we recommend for doing context diffs for git,
> > > git-external-diff, is not portable:
> > >
> > > ? ? ? ?http://anarazel.de/pg/git-external-diff
> > >
> > > It uses diff -L, which is not supported by FreeBSD, and I imagine many
> > > other operating systems.
> > >
> > > If we want people to use this to produce context diffs, we should
> > > provide a portable script. ?I can modify it to be portable, but it is
> > > currently hosted on some other site. ?How should I handle this? ? ?How
> > > do I contact the author, or perhaps I should create a new on on
> > > ftp.postgresql.org and link to that.
> >
> > Do it the git way - fork it and put it on your github page.
> >
> > Or do it the pg way - fork it and put it in src/tools.
>
> src/tools is a very good idea. Objections?

Done, and linked to from our git wiki page:

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

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

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