On Mon, 3 Jan 2011 10:44:19 +0100, Magnus Hagander
<magnus@hagander.net> wrote:
> Yeah, it looks that way - it's missing the ordering of the contrib
> I'll run it once for that now, and then please rebase your
> patch on top of that - makes it easier to review it.
The rebased patch can be grabbed from http://www.piening.info/VS2010v2.patch
It's actually the same patch as before with the corrupted line-endings
parsed out.
"git diff master VS2010 > ../VS2010.patch" reproduceabyl generates those
on my (windows) system when I use git-external-diff configured as
described in
http://wiki.postgresql.org/wiki/Working_with_Git#Context_diffs_with_Git
to produce context diffs.
Unified diffs (git diff master VS2010 --no-ext-diff >
../VS2010_unified.patch) only contain valid unix linfeeds
Perhaps it has got something to do with core.autocrlf=true but I don't
really care as long as I can get rid of it with one line of perl ;-)
For the records I'm using
$ git --version
git version 1.7.3.1.msysgit.0
and the configuration of the postgresql repository is
$ git config --list
core.symlinks=false
core.autocrlf=true
color.diff=auto
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
user.name=Brar Piening
user.email=[myemail]
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.ignorecase=true
core.hidedotfiles=dotGitOnly
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git://git.postgresql.org/git/postgresql.git
branch.master.remote=origin
branch.master.merge=refs/heads/master
diff.external=git-external-diff
Best regards,
Brar
