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 2013-11-11 23:34:41 -04:00
commit 4efc744634
6 changed files with 70 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/git-annex_broken_on_Android_4.3/comment_24_c9e399833cc6235077161f490dfa866f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc"
nickname="Sören"
subject="comment 24"
date="2013-11-11T19:56:04Z"
content="""
hello-cabal working, git-annex-byhand not.
"""]]

9
doc/bugs/git-annex_broken_on_Android_4.3/comment_25_cf093737eefb2b99f6f0eac9bf3e74b3._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y"
nickname="Michael Alan"
subject="I got the same results as Sören."
date="2013-11-11T20:37:08Z"
content="""
cabal doesn't seem to be the culprit.
"""]]

29
doc/bugs/git-annex_broken_on_Android_4.3/comment_26_c122ce53175fc9e0e114a8acd2385c0d._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="finally getting debugger spun up"
date="2013-11-12T01:08:24Z"
content="""
<https://code.google.com/p/android/issues/detail?id=28598> seems relevant (and the patches to fix it seem likely to have led to the linker rejecting this).
So I can probably stop torturing your soft keyboards. I need a binary where `arm-linux-androideabi-4.8/bin/arm-linux-androideabi-readelf -r` does not contain `R_ARM_COPY`. Checking against the binaries so far, this consistently matches the test results, all the git-annex binaries have:
<pre>
Offset Info Type Sym.Value Sym. Name
011d05f0 00004e14 R_ARM_COPY 011d05f0 environ
</pre>
(Which is itself interesting; I've had to work around some problems with the haskell port not supporting getting the environment (Annex.Branch.withIndex). Possibly because it was copied and the linker screwed that up? <https://github.com/neurocyte/ghc-android/issues/7>)
Ok, here's a binary that meets those criteria. Obtained by passing -z nocopyreloc to the gold linker (ghc options -optl-z -optlnocopyreloc)
<http://tmp.kitenet.net/git-annex-nocopy>
Also, here's a hello world binary that *should* fail. It attempts to read and print the environment, and has the same `R_ARM_COPY` relocation.
<http://tmp.kitenet.net/hello-env-copy>
And, here's a hello world binary that *might* successfully print out the full environment (like `set` does). If it does, I can also remove the ugly hack in Annex.Branch.withIndex. Which would be an unexpected reward.
<http://tmp.kitenet.net/hello-env-nocopy>
"""]]

10
doc/bugs/git-annex_broken_on_Android_4.3/comment_27_237e41e61781bb058f5fd39362a904e4._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y"
nickname="Michael Alan"
subject="nocopy variants work!"
date="2013-11-12T03:17:09Z"
content="""
I tested both the hello-env-nocopy and the git-annex-nocopy binaries successfully. hello-env-copy failed as you predicted.
Yay!
"""]]

12
doc/forum/Using_git_annex_with_Android_tablet_which_only_has_exFAT_and_no_symlinks/comment_4_c8446ee1b817f1824fa0df07e742015c._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="Mebus"
ip="2001:4dd0:ff00:29::2"
subject="comment 4"
date="2013-11-11T20:24:11Z"
content="""
Does it have to be the place, where they were created or can this also be a central server, I pushed everything to?
Mebus
"""]]

4
doc/git-annex.mdwn
View file

@ -690,8 +690,8 @@ subdirectories).
Use this to undo an accidental `git annex add` command. It puts the
file back how it was before the add.
Note that for safety, the content of the file remains in the annex (as a
hard link), until you use `git annex unused` and `git annex dropunused`.
Note that for safety, the content of the file remains in the annex,
until you use `git annex unused` and `git annex dropunused`.
This is not the command you should use if you intentionally annexed a
file and don't want its contents any more. In that case you should use