Thread: git diff script is not portable

git diff script is not portable

From
Bruce Momjian
Date:
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@momjian.us>        http://momjian.us EnterpriseDB
http://enterprisedb.com
 + It's impossible for everything to be true. +


Re: git diff script is not portable

From
Magnus Hagander
Date:
On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce@momjian.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/


Re: git diff script is not portable

From
Andres Freund
Date:
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


Re: git diff script is not portable

From
Bruce Momjian
Date:
Magnus Hagander wrote:
> On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce@momjian.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@momjian.us>        http://momjian.us EnterpriseDB
http://enterprisedb.com
 + It's impossible for everything to be true. +


Re: git diff script is not portable

From
Bruce Momjian
Date:
Bruce Momjian wrote:
> Magnus Hagander wrote:
> > On Wed, Nov 17, 2010 at 19:54, Bruce Momjian <bruce@momjian.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@momjian.us>        http://momjian.us EnterpriseDB
http://enterprisedb.com
 + It's impossible for everything to be true. +