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-12-12 14:03:54 -04:00
commit ddf810a4fb
11 changed files with 116 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/forum/Can_Not_Sync_to_Git_Repo/comment_7_415bab6a7ab564e671f42cfad83e0e58._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 7"
date="2013-12-12T17:07:37Z"
content="""
What branch does `git branch` say is checked out?
If you're using direct mode, you should not have the master branch checked out. Instead you should have an `annex/direct/master` branch that direct mode sets up and automatically switches you to. (Commits are still made to the master branch when syncing.)
"""]]

11
doc/forum/Windows_S3_host_issue.mdwn Normal file
View file

@ -0,0 +1,11 @@
I am trying to connect to dreamhost's objects (S3) platform. I am using the windows version.
Am I specifying the host correctly? Any help is appreciated.
$ git-annex initremote host="objects.dreamhost.com" cloud keyid=XXXXX type=S3
initremote host=objects.dreamhost.com (encryption setup) (hybrid cipher with gpg
key 70827ADCDE25DA0F) (checking bucket...)
git-annex: user error (openTCPConnection: host lookup failure for "host=objects.
dreamhost.com-f5573b49-3668-4f94-a1da-aa55085c45e8.s3.amazonaws.com")
failed
git-annex.exe: initremote: 1 failed

10
doc/forum/Windows_S3_host_issue/comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 1"
date="2013-12-12T17:38:21Z"
content="""
No, you cannot quote part of a parameter like that. git-annex thinks you are trying to use a host that includes the quote marks you put around it.
Since you're using Windows, I can't give any advice on how to use quoting at the shell/cmd prompt. However, I don't see any need for quoting here anyway.
"""]]

10
doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_1_6889c4452e636474b4e70798b404fed2._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 1"
date="2013-12-12T17:11:59Z"
content="""
It sounds like the contents of the files are being successfully transferred.
It may be that you're using an old and buggy version of git-annex, in which the direct mode code lost track of things and so failed to update the tree correctly when receiving the content of a file. If so, you could fix it by upgrading git-annex and running `git annex fsck`.
"""]]

5
doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__.mdwn Normal file
View file

@ -0,0 +1,5 @@
I would like to be able to use git-annex to not only sync binary files for a project but also to be able to use it more like git, that is adding manually files to index and only commiting that.
I think it is still possible in indirect-mode to manage files like I want, but as I am stuck in windows, I would like to be able to do that in direct-mode...
Due to the safety measures taken to avoid doing bad things in direct-mode, it doesn't seem possible to commit (and push) files without syncing the whole repository.
Is it currently possible to do what I would like to do, or will it be possible in the future ?

14
doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_1_804e43111ee97dff15e49e50b6c29d91._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 1"
date="2013-12-12T17:01:50Z"
content="""
You can `git annex add` some files and leave others not added, and `git annex sync` will commit only the added ones.
What is missing is a way to have changed some files that were added, and avoid `git annex sync` committing them.
There is no technical reason this cannot be supported in direct mode, there is just no user interface built to do it.
One way is to temporarily bypass the direct mode guard, by using the appropriate git command line option to set core.bare=false temporarily while committing files. Note that it's then up to you to avoid staging the entire content of the file into the index (so no `git commit -a` etc).
"""]]

8
doc/forum/local_pairing_with_2_mac/comment_1_6ca4fed183340a2902d1d4d91284b772._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 1"
date="2013-12-12T17:47:30Z"
content="""
What version of OSX is the failing computer running? What version of git-annex? How did you install git-annex on it?
"""]]