From 8b14fa023158f7559a01fa77fc7e2b19daa4579d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawknruiCHUcOh2mmpkh7OFJ4iNfAOOamRVs" Date: Thu, 12 Dec 2013 06:02:34 +0000 Subject: [PATCH 01/11] --- ..._way_to_only_commit_some_files_in_direct-mode___63__.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__.mdwn diff --git a/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__.mdwn b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__.mdwn new file mode 100644 index 0000000000..9c76e1d425 --- /dev/null +++ b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__.mdwn @@ -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 ? From 8830542a17d4dbe3572e30c26f8acf67d73f326f Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:01:53 +0000 Subject: [PATCH 02/11] Added a comment --- ...ent_1_804e43111ee97dff15e49e50b6c29d91._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_1_804e43111ee97dff15e49e50b6c29d91._comment diff --git a/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_1_804e43111ee97dff15e49e50b6c29d91._comment b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_1_804e43111ee97dff15e49e50b6c29d91._comment new file mode 100644 index 0000000000..9a75526146 --- /dev/null +++ b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_1_804e43111ee97dff15e49e50b6c29d91._comment @@ -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). +"""]] From e6a7cc0d466eb25728658bef0fdd4f0716292099 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:07:37 +0000 Subject: [PATCH 03/11] Added a comment --- ...comment_7_415bab6a7ab564e671f42cfad83e0e58._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Can_Not_Sync_to_Git_Repo/comment_7_415bab6a7ab564e671f42cfad83e0e58._comment diff --git a/doc/forum/Can_Not_Sync_to_Git_Repo/comment_7_415bab6a7ab564e671f42cfad83e0e58._comment b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_7_415bab6a7ab564e671f42cfad83e0e58._comment new file mode 100644 index 0000000000..8b1824ede5 --- /dev/null +++ b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_7_415bab6a7ab564e671f42cfad83e0e58._comment @@ -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.) +"""]] From 3f94bc393deaf5419b734033e844046e89e027a5 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:11:59 +0000 Subject: [PATCH 04/11] Added a comment --- ...comment_1_6889c4452e636474b4e70798b404fed2._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_1_6889c4452e636474b4e70798b404fed2._comment diff --git a/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_1_6889c4452e636474b4e70798b404fed2._comment b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_1_6889c4452e636474b4e70798b404fed2._comment new file mode 100644 index 0000000000..c97f26e860 --- /dev/null +++ b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_1_6889c4452e636474b4e70798b404fed2._comment @@ -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`. +"""]] From 81a0ad89d7732fedc2834c017d1a583898ccc33c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_bIB1Vadfc_GfPLKX_ScfWFCcaGyk8Ac" Date: Thu, 12 Dec 2013 17:12:40 +0000 Subject: [PATCH 05/11] --- doc/forum/Windows_S3_host_issue.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/Windows_S3_host_issue.mdwn diff --git a/doc/forum/Windows_S3_host_issue.mdwn b/doc/forum/Windows_S3_host_issue.mdwn new file mode 100644 index 0000000000..02cd879073 --- /dev/null +++ b/doc/forum/Windows_S3_host_issue.mdwn @@ -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 From 535936e4d86f0e0607bdf6ae3a75488d66eead58 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:20:27 +0000 Subject: [PATCH 06/11] Added a comment --- ...mment_1_a486dc0f741e08d5bcf2fd1a6ecbdf05._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/bugs/Backup_repository_doesn__39__t_get_all_files/comment_1_a486dc0f741e08d5bcf2fd1a6ecbdf05._comment diff --git a/doc/bugs/Backup_repository_doesn__39__t_get_all_files/comment_1_a486dc0f741e08d5bcf2fd1a6ecbdf05._comment b/doc/bugs/Backup_repository_doesn__39__t_get_all_files/comment_1_a486dc0f741e08d5bcf2fd1a6ecbdf05._comment new file mode 100644 index 0000000000..54c5795091 --- /dev/null +++ b/doc/bugs/Backup_repository_doesn__39__t_get_all_files/comment_1_a486dc0f741e08d5bcf2fd1a6ecbdf05._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.87" + subject="comment 1" + date="2013-12-12T17:20:27Z" + content=""" +The assistant currently only considers transferring files to other remotes that are currently in the tree, not old versions of files, or files no longer in the tree. You can send everything, manually, by running `git annex copy --all --to backupremote` + +When you're using direct mode, git-annex does not try ensure that every historical version of a file is preserved. Because in direct mode there is only one copy of a file, and you can edit or delete it at any time. If preserving every version is important to you, don't use direct mode; indirect mode will handle this nicely. (Of course you can still force it to remove files in indirect mode.) + +I think it would make sense for the assistant to sometimes try to send everything to some remotes. The tricky part is probably working out which remotes it makes sense to send that to. Currenty, [[preferred_content]] expressions only indicate whether files currently in the tree are wanted. They would need to be expanded somehow, so that full backup repositories could indicate they also want every available past version of a file. +"""]] From e50d1a882c9424de618c3b6f2051456c4a8d9283 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:32:23 +0000 Subject: [PATCH 07/11] Added a comment --- ...comment_1_bec4a7253e851567cd47b96ceead5d91._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Building_on_OpenBSD/comment_1_bec4a7253e851567cd47b96ceead5d91._comment diff --git a/doc/bugs/Building_on_OpenBSD/comment_1_bec4a7253e851567cd47b96ceead5d91._comment b/doc/bugs/Building_on_OpenBSD/comment_1_bec4a7253e851567cd47b96ceead5d91._comment new file mode 100644 index 0000000000..01304cc8fa --- /dev/null +++ b/doc/bugs/Building_on_OpenBSD/comment_1_bec4a7253e851567cd47b96ceead5d91._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.87" + subject="comment 1" + date="2013-12-12T17:32:23Z" + content=""" +network-info is where IPv4 and IPv6 are defined. You have chosen to installs it \"dev\" branch, which removes those and has a top commit of \"wip - don't pull this, not working on unix yet\". + +What you should really do is just disable local pairing, which avoids the need for porting network-info to openbsd. You can do so by passing -f-Pairing to cabal configure. There are lots of other features that can be similarly disabled if their necessary depedencies cannot be installed (normally this is done automatically.) +"""]] From 2c3c888a58815fd06c8c238abe6842072cd9b7e7 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:35:28 +0000 Subject: [PATCH 08/11] Added a comment --- .../comment_10_d1bd5d6b33951f6d11185bb4a8228269._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_10_d1bd5d6b33951f6d11185bb4a8228269._comment diff --git a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_10_d1bd5d6b33951f6d11185bb4a8228269._comment b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_10_d1bd5d6b33951f6d11185bb4a8228269._comment new file mode 100644 index 0000000000..b00d961d09 --- /dev/null +++ b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_10_d1bd5d6b33951f6d11185bb4a8228269._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.87" + subject="comment 10" + date="2013-12-12T17:35:28Z" + content=""" +The behavior is direct mode is a bug: [[bugs/when syncing a direct repository, git annex delete non annexed new git files]]. Hopefully it will be fixed soon. +"""]] From 00e1ddbb93c8e0a7bb22a75f548b27d505b0ad5e Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:38:21 +0000 Subject: [PATCH 09/11] Added a comment --- ...comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Windows_S3_host_issue/comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment diff --git a/doc/forum/Windows_S3_host_issue/comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment b/doc/forum/Windows_S3_host_issue/comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment new file mode 100644 index 0000000000..7382cafa6e --- /dev/null +++ b/doc/forum/Windows_S3_host_issue/comment_1_8c0a1e84713a04a25fdc1f74919d34aa._comment @@ -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. +"""]] From 4d84940c314381c919757d72eaac842ab7cc48f3 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:47:30 +0000 Subject: [PATCH 10/11] Added a comment --- .../comment_1_6ca4fed183340a2902d1d4d91284b772._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/local_pairing_with_2_mac/comment_1_6ca4fed183340a2902d1d4d91284b772._comment diff --git a/doc/forum/local_pairing_with_2_mac/comment_1_6ca4fed183340a2902d1d4d91284b772._comment b/doc/forum/local_pairing_with_2_mac/comment_1_6ca4fed183340a2902d1d4d91284b772._comment new file mode 100644 index 0000000000..25c97805b0 --- /dev/null +++ b/doc/forum/local_pairing_with_2_mac/comment_1_6ca4fed183340a2902d1d4d91284b772._comment @@ -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? +"""]] From e2a5befc1962654594d088b8ffb3ec25070f94b8 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Thu, 12 Dec 2013 17:54:55 +0000 Subject: [PATCH 11/11] Added a comment --- ...9_849883b7cc05bfcb01914d8737098010._comment | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/sync/comment_9_849883b7cc05bfcb01914d8737098010._comment diff --git a/doc/sync/comment_9_849883b7cc05bfcb01914d8737098010._comment b/doc/sync/comment_9_849883b7cc05bfcb01914d8737098010._comment new file mode 100644 index 0000000000..ac65b03e67 --- /dev/null +++ b/doc/sync/comment_9_849883b7cc05bfcb01914d8737098010._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.87" + subject="comment 9" + date="2013-12-12T17:54:55Z" + content=""" +@Dav what kind of url does the upstream remote have? Perhaps it would be sufficient to make sync skip trying to push to git:// and http[s]:// remotes. Both are unlikely to accept pushes and in the cases where they do accept pushes it would be fine to need a manual `git push`. + +Anyway, you can already configure which remotes get synced with. From the man page: + +
+       remote.<name>.annex-sync
+              If set to false, prevents  git-annex  sync  (and  the  git-annex
+              assistant) from syncing with this remote.
+
+ +So `git config remote.upstream.annex-sync=false` +"""]]