mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2012-07-24 11:01:43 -04:00
commit 50b9c6c6f7
3 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/fat_support/comment_6_a3b6000330c9c376611c228d746a1d55._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkZRoTRyW3tox-FD2DQWxskgI6_tkEtHL4"
nickname="Ben"
subject="comment 6"
date="2012-07-23T16:11:52Z"
content="""
The above would work fine for me but the files in my annex (e.g. .git/annex/objects/xx/yy/blah.ogg) don't have extensions like that, so my media player doesn't recognize them as media files. How do I get the files under \"objects\" to keep the extensions of the original files like in Joey's example?
"""]]

7
doc/bugs/fat_support/comment_7_a0ac7f2c44efc8116940c7b94b35e9d0._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="http://joeyh.name/"
subject="comment 7"
date="2012-07-24T14:51:50Z"
content="""
You can get the extensions by migrating to the SHA1E (or SHA256E) backend.
"""]]

30
doc/install/OSX/comment_16_af6fe3540032cdf4400478de87771058._comment Normal file
View file

@ -0,0 +1,30 @@
[[!comment format=mdwn
username="https://a-or-b.myopenid.com/"
ip="203.45.2.230"
subject="Compiling git-annex on OSX (with 32 bit Haskell)"
date="2012-07-24T03:26:45Z"
content="""
I came across an issue when following the instructions here:
<http://git-annex.branchable.com/install/OSX/>
I'm compiling the 'assistant' branch (522f568450a005ae81b24f63bb37e75320b51219).
The pre-compiled version of Haskell for OSX recommends the 32 bit installer, however git-annex compiles
> Utility/libdiskfree.o Utility/libkqueue.o Utility/libmounts.o
as 64 bit. The 'make' command fails on linking 32- and 64-bit code.
So... I made a small change to the Makefile
> CFLAGS=-Wall
becomes
> CFLAGS=-Wall -m32
I don't know if there is an easy way to programmatically check for this, or even if you'd want to spend time doing it, but it might help someone else out.
<https://gist.github.com/3167798>
"""]]