#38902: Write a pre-commit hook to prevent expanded keywords from being committed -----------------------------+------------------------- Reporter: ryandesign@… | Owner: wsiegrist@… Type: enhancement | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | -----------------------------+------------------------- Comment (by egall@…): Could this be a check done in `port lint` as well? -- Ticket URL: <https://trac.macports.org/ticket/38902#comment:2> MacPorts <http://www.macports.org/> Ports system for OS X

#38902: Write a pre-commit hook to prevent expanded keywords from being committed -----------------------------+------------------------- Reporter: ryandesign@… | Owner: wsiegrist@… Type: enhancement | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | -----------------------------+------------------------- Comment (by aronnax@…): Maybe we should first check if this issue is known to the {{{git-svn}}} developers. -- Ticket URL: <https://trac.macports.org/ticket/38902#comment:6> MacPorts <http://www.macports.org/> Ports system for OS X

#38902: Write a pre-commit hook to prevent expanded keywords from being committed -----------------------------+------------------------- Reporter: ryandesign@… | Owner: wsiegrist@… Type: enhancement | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | -----------------------------+------------------------- Comment (by ecronin@…): In pure git you can't do keyword substitution, but git-svn is a bridge between a local git repo and a remote svn repo and can perform translations as changes go from one to the other. Recent versions of git- svn compress the expanded keyword down to just the $Id$ marker before creating the commit object in git. It is ignored and left alone during all git operations, but then gets expanded back out properly by svn on dcommit. It's a little annoying because locally you don't have the Id info in the file so you have to use git log, but it shouldn't be causing issues with svn. I have no idea when it was added to git-svn, it's worked fine for at least a year for me. Setting the svn attributes to begin with, however, I think you still have do using a svn checkout. And I haven't found a way to turn a git mv into a svn mv that maintains history. -- Ticket URL: <https://trac.macports.org/ticket/38902#comment:8> MacPorts <http://www.macports.org/> Ports system for OS X

#38902: Write a pre-commit hook to prevent expanded keywords from being committed -----------------------------+------------------------- Reporter: ryandesign@… | Owner: wsiegrist@… Type: enhancement | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | -----------------------------+------------------------- Comment (by ecronin@…): It doesn't do keyword expansion in git. It just doesn't screw things up when they're pushed back to svn which is what this ticket is trying to prevent. {{{ % which git /opt/local/bin/git % git svn proplist Portfile Properties on 'Portfile': svn:entry:committed-date svn:entry:committed-rev svn:entry:last-author svn:entry:uuid svn:eol-style svn:keywords svn:wc:ra_dav:version-url % git svn propget svn:keywords Portfile Id % head -1 Portfile # $Id$ }}} If I look at this Portfile in trac from svn the Id line is fully expanded. I checked my global .gitconfig and my macports/.git directory and I don't see that I did any extra customization to get this behavior, but I made this checkout long ago and I don't have time to go digging at the moment. But the link in comment:7 doesn't apply here because the authoritative repo is svn not git. In git-land there is still no keyword substitution happening, and any attempts at faking it using client hooks on commit like suggested there would just break things when it was pushed back into svn. -- Ticket URL: <https://trac.macports.org/ticket/38902#comment:10> MacPorts <http://www.macports.org/> Ports system for OS X