What's cooking in git.git (Jul 2012, #05; Sun, 15)

2012-07-15 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The sixth batch of topics are now in 'master'. You can find the changes described here in the integration branches of the repositories listed a

Re: Bug Report - Binary Files as plain files, line endings conversions

2012-07-15 Thread Jose Nobile
Hi, $ git add . warning: LF will be replaced by CRLF in web/images/logo_twitter.png. The file will have its original line endings in your working directory. JOSE@COMPAQ /d/wamp/www/internationalstudies.co (master) $ git --version git version 1.7.11.msysgit.0 JOSE@COMPAQ /d/wamp/www/inter

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-15 Thread Junio C Hamano
Jonathan Nieder writes: > Hi Florian, > > Florian Achleitner wrote: > >> After importing new commits on top of refs/remotes/* the >> ref was overwritten with the local refs/heads/master, because the name >> of the remote reference to fetch, i.e. refs/heads/master, was used to >> retrieve old_sha1

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-15 Thread Jonathan Nieder
Hi Florian, Florian Achleitner wrote: > After importing new commits on top of refs/remotes/* the > ref was overwritten with the local refs/heads/master, because the name > of the remote reference to fetch, i.e. refs/heads/master, was used to > retrieve old_sha1 for it's local counterpart. Therefo

Re: [PATCH] fast-import: catch deletion of non-existent file in input

2012-07-15 Thread Jeff King
On Sun, Jul 15, 2012 at 01:11:51PM -0500, Jonathan Nieder wrote: > > Subject: fast-import: catch deletion of non-existent file in input > [...] > > We silently ignored the bogus "D foo" directive, and the > > resulting tree incorrectly contained "bar". With this patch, > > we notice the bogus inpu

Re: [RFC] Add a new email notification script to "contrib"

2012-07-15 Thread Michael Haggerty
On 07/15/2012 09:11 AM, Junio C Hamano wrote: mhag...@alum.mit.edu writes: Add a new Python script, contrib/hooks/post-receive-multimail.py, that can be used to send notification emails describing pushes into a git repository. This script is derived from contrib/hooks/post-receive-mail, but has

Re: Support of '^' as alias for 'HEAD^'

2012-07-15 Thread Zeeshan Ali (Khattak)
On Sun, Jul 15, 2012 at 8:45 PM, Holger Hellmuth wrote: > Am 15.07.2012 00:24, schrieb Zeeshan Ali (Khattak): > >> On Sun, Jul 15, 2012 at 12:26 AM, Junio C Hamano >> wrote: >>> >>> "Zeeshan Ali (Khattak)" writes: >>> What about '^' and '^^' that I suggested? > > > If you want a shortcut, yo

Re: [PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-15 Thread Jonathan Nieder
Hi, Michael Cree wrote: > On 15/07/2012, at 8:50 AM, Jonathan Nieder wrote: >> gcc takes full advantage by converting the get_be32 >> calls back to a load and bswap and producing a whole bunch of >> unaligned access traps. > > Alpha does not have a bswap (or similar) instructio

Re: [PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-15 Thread Michael Cree
Jonathan, Thanks for acting so promptly on this. Just a minor point on the commit message below. On 15/07/2012, at 8:50 AM, Jonathan Nieder wrote: Unfortunately, Michael noticed on an Alpha machine that git was using plain 32-bit reads anyway. As soon as we convert a pointer to int *, the

Re: Implementing authenticated Smart HTTP - which URLs to secure

2012-07-15 Thread Shawn Pearce
On Sun, Jul 15, 2012 at 6:43 AM, Jonas H. wrote: > I'd like to implement HTTP authentication for Git Smart HTTP using Dulwich > (a Python binding): > > 1) read-only if unauthenticated and write only if authenticated > 2) read/write only if authenticated > > I couldn't find any documentation on whi

Re: [PATCH] fast-import: catch deletion of non-existent file in input

2012-07-15 Thread Jonathan Nieder
Hi, Jeff King wrote: > Subject: fast-import: catch deletion of non-existent file in input [...] > We silently ignored the bogus "D foo" directive, and the > resulting tree incorrectly contained "bar". With this patch, > we notice the bogus input and die. This breaks svn-fe, which relies on the e

Re: Support of '^' as alias for 'HEAD^'

2012-07-15 Thread Holger Hellmuth
Am 15.07.2012 00:24, schrieb Zeeshan Ali (Khattak): On Sun, Jul 15, 2012 at 12:26 AM, Junio C Hamano wrote: "Zeeshan Ali (Khattak)" writes: What about '^' and '^^' that I suggested? If you want a shortcut, you might try this: echo "ref: HEAD" > .git/h Then you can use 'h' instead of 'HEA

[PATCH] Fix overwritten remote ref on with fast-import.

2012-07-15 Thread Florian Achleitner
After importing new commits on top of refs/remotes/* the ref was overwritten with the local refs/heads/master, because the name of the remote reference to fetch, i.e. refs/heads/master, was used to retrieve old_sha1 for it's local counterpart. Therefore, old_sha1 pointed to the local head which was

Implementing authenticated Smart HTTP - which URLs to secure

2012-07-15 Thread Jonas H.
Howdy! I'd like to implement HTTP authentication for Git Smart HTTP using Dulwich (a Python binding): 1) read-only if unauthenticated and write only if authenticated 2) read/write only if authenticated I couldn't find any documentation on which URLs need be secured and what response codes ar

Re: t1450-fsck (sometimes/often) failes on Mac OS X

2012-07-15 Thread Torsten Bögershausen
Peff, thanks for looking into this. My answers are inline and at the end. On 15.07.12 11:08, Jeff King wrote: > On Sat, Jul 14, 2012 at 02:21:35PM +0200, Torsten Bögershausen wrote: > >> I saw the problem first on pu, some time ago, >> but it dissappeared after cloning git.git into another dire

[PATCH] fast-import: catch deletion of non-existent file in input

2012-07-15 Thread Jeff King
On Fri, Jul 13, 2012 at 03:39:50PM +0200, Andreas Schwab wrote: > >> The output contains these lines: > >> > >> R a/b b/b > >> D a/b > >> > >> Changing the second line to D b/b fixes the bug. > > > > Yeah, I agree that is problematic. But I do not think it is a > > fast-import bug, but rather bo

Re: [PATCH] doc: A few minor copy edits.

2012-07-15 Thread Štěpán Němec
On Sat, 14 Jul 2012 22:32:05 -0700 Junio C. Hamano wrote: > Thanks. All looked reasonable, except that I've heard nobody says > "ent" for the past couple of years, and it might be better to drop > the entry altogether. Yeah, I have no real opinion here. I've never been a Tolkien fan, so I had no

Re: t1450-fsck (sometimes/often) failes on Mac OS X

2012-07-15 Thread Jeff King
On Sat, Jul 14, 2012 at 02:21:35PM +0200, Torsten Bögershausen wrote: > I saw the problem first on pu, some time ago, > but it dissappeared after cloning git.git into another directory. > > Now it appeared on next as well, so it's time to look a little bit deeper. > > This test case of t1450 fa

Re: (Ab)using filter-branch from a post-receive hook

2012-07-15 Thread Wincent Colaiuta
On Jul 14, 2012, at 11:44 PM, Junio C Hamano wrote: > Wincent Colaiuta writes: > >> On Jul 14, 2012, at 10:25 PM, Junio C Hamano wrote: >> >>> I did not see anything wrong doing what you described in the >>> post-receive, even though having the hook in the "scratch" felt >>> strange, as the "co

Complete audit trail for embedded (Linux) system lifecycle with Git

2012-07-15 Thread Kalle Launiala
Hello, We are to solve a complete audit trail solution for full subcontractor value-chain fullfilling European Union machinery directive: http://ec.europa.eu/enterprise/sectors/mechanical/machinery/ To summarize, the directive is created to ensure safe operating environment for all kind of machin

Re: Support of '^' as alias for 'HEAD^'

2012-07-15 Thread Jeff King
On Sun, Jul 15, 2012 at 01:24:18AM +0300, Zeeshan Ali (Khattak) wrote: > > Think what "log ^^ origin" would mean. Is it "log ^HEAD^ origin"? > > Is it "log HEAD^^ origin"? They mean totally different things. > > Sorry for my ignorance here but what does ^ *before* HEAD even mean? I It means "n

Re: [RFC] Add a new email notification script to "contrib"

2012-07-15 Thread Junio C Hamano
mhag...@alum.mit.edu writes: > From: Michael Haggerty > > Add a new Python script, contrib/hooks/post-receive-multimail.py, that > can be used to send notification emails describing pushes into a git > repository. This script is derived from > contrib/hooks/post-receive-mail, but has many differ