Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
d52c2b37ad
5 changed files with 52 additions and 0 deletions
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="24.159.78.125"
|
||||
subject="comment 1"
|
||||
date="2014-07-23T22:10:37Z"
|
||||
content="""
|
||||
Support for --listen with a port was removed in version 5.20140306, since it was buggy. In particular, when the webapp creates a new repository, it needs to switch to a new port to serve that repository, so specifying a single port won't work.
|
||||
|
||||
Instead, when annex.listen or --listen specifies the address to listen on, `git annex webapp` will print out the url to use to open it, including the port it picked. This could be used in a script, or clicked on in the terminal to open a local browser when running the webapp on a remote host.
|
||||
"""]]
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="markusk"
|
||||
ip="79.243.250.79"
|
||||
subject="comment 2"
|
||||
date="2014-07-23T23:18:37Z"
|
||||
content="""
|
||||
Thank you for the info! Will add the port grep to my auth grep script as you suggested.
|
||||
"""]]
|
21
doc/forum/local_subtree_and_broken_symlinks.mdwn
Normal file
21
doc/forum/local_subtree_and_broken_symlinks.mdwn
Normal file
|
@ -0,0 +1,21 @@
|
|||
Here's a simple example on a repository with three branches, where we'll be adding images-annex as a subtree into master.
|
||||
|
||||
$ git branch
|
||||
git-annex
|
||||
images-annex
|
||||
* master
|
||||
$ git subtree add --squash --prefix=images/ images-annex
|
||||
Added dir 'images'
|
||||
$ ls
|
||||
FILE_A FILE_B images/
|
||||
|
||||
...checkout images-annex, make changes, commit...
|
||||
|
||||
$ git checkout master
|
||||
$ git subtree pull --squash --prefix=images/ . images-annex
|
||||
From .
|
||||
* branch images-annex -> FETCH_HEAD
|
||||
Merge made by the 'recursive' strategy.
|
||||
...(files created/modified/etc)
|
||||
|
||||
I have tried a few different methods for merging the subtree in and so far have not been able to keep git-annex links up to date. Running `git-annex fix .` does what it's supposed to but then git sees everything as modified. Is this entirely the expected behavior because of the --prefix? I have not used subtrees much before but the model appears to be very helpful for what I'm trying to do.
|
|
@ -19,6 +19,12 @@ detailed instructions | quick install
|
|||
[[Windows]] | [download installer](http://downloads.kitenet.net/git-annex/windows/current/) **alpha**
|
||||
"""]]
|
||||
|
||||
The downloaded package's integrity can be verified by the public PGP key. On Linux,
|
||||
|
||||
$ wget https://downloads.kitenet.net/git-annex/gpg-pubkey.asc
|
||||
$ gpg --import gpg-pubey.asc
|
||||
$ gpg --verify git-annex-standalone-*.tar.gz.sig
|
||||
|
||||
## Using cabal
|
||||
|
||||
As a haskell package, git-annex can be installed from source pretty easily
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
I've just come across this issue and I'm not sure if git-annex is the right place to put it, but in case it is easy enough to do.. may as well ask!
|
||||
|
||||
In this scenario, an online service (Bandcamp), automatically creates the archive file when downloading an album each and every time you download it. This results in identical files inside a zip, but different hashes due to the slightly different timestamps on the archive itself.
|
||||
|
||||
Would it be possible for git-annex to be able to detect this scenario (in a manner similar to zipcmp) and redirect an add/import to the already existing copy?
|
||||
|
||||
I've found this due to trying to decommission an old annex by `git annex import --clean-duplicates ~/annex_old/.git/annex/objects` and finding these files being left.
|
Loading…
Add table
Add a link
Reference in a new issue