Jeff King wrote:
On Thu, Jan 29, 2009 at 04:47:19AM +0000, Alec Clews wrote:
What git version are you using? Can you post a shell snippet that breaks
reliably?
I used 1.5.6.3 on Ubuntu and 1.6.1.1 on Cygwin.
The problem appears to be spaces around '=' in the attributes file. This
fails for me
----------8<----------------------------------
commit() {
echo $1 >file && git add file && git commit -m $1
}
rm -rf repo
mkdir repo && cd repo && git init
commit base
commit branch-master
git checkout -b other HEAD^
commit branch-other
echo '* merge = overwrite' >.git/info/attributes
cat >>.git/config <<'EOF'
[merge "overwrite"]
name = overwrite using cp
driver= cp %B %A
EOF
git merge master
----------8<---------------------------------
--
Alec Clews
Personal <alec.clews@xxxxxxxxx> Melbourne, Australia.
Jabber: alecclews@xxxxxxxxxxxxx PGPKey ID: 0x9BBBFC7C
Blog http://alecthegeek.wordpress.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
