summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-19 15:44:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-19 15:44:41 -0400
commit255b062dc706433f5d14ff13ea4127af8a7608d5 (patch)
tree46f8db339c03d754f6560b28d22c06ed056fdc3e
parent4c6a6b059b97187c2c176cffe7517d20bbe39531 (diff)
parent6a20fe275f6f2e8626480d7b0d4a4f9924c85207 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bare_repositories/comment_4_7cf6103709a7a2710686681a6f406214._comment8
-rw-r--r--doc/bare_repositories/comment_5_6328134497c0de6a088087fc9cb0e59e._comment31
-rw-r--r--doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment12
-rw-r--r--doc/bugs/keeps_demanding_ssh_key_even_if_all_sync__39__s_turned_down.mdwn60
4 files changed, 111 insertions, 0 deletions
diff --git a/doc/bare_repositories/comment_4_7cf6103709a7a2710686681a6f406214._comment b/doc/bare_repositories/comment_4_7cf6103709a7a2710686681a6f406214._comment
new file mode 100644
index 000000000..0953d091f
--- /dev/null
+++ b/doc/bare_repositories/comment_4_7cf6103709a7a2710686681a6f406214._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/bBy7WkgQicYHIiiyj.Vm0TcMbxi2quzbPFef#6f9f7"
+ nickname="Frederik Vanrenterghem"
+ subject="Convert bare repository to normal"
+ date="2015-05-19T09:17:15Z"
+ content="""
+Just wondering what the right steps are to convert a bare repository to a normal one? The comment above from 2.5 years ago includes the creation of a .git directory, which actually already exists. Have things changed in the mean time?
+"""]]
diff --git a/doc/bare_repositories/comment_5_6328134497c0de6a088087fc9cb0e59e._comment b/doc/bare_repositories/comment_5_6328134497c0de6a088087fc9cb0e59e._comment
new file mode 100644
index 000000000..80906857e
--- /dev/null
+++ b/doc/bare_repositories/comment_5_6328134497c0de6a088087fc9cb0e59e._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 5"
+ date="2015-05-19T12:18:05Z"
+ content="""
+Well, no, i don't think they changed, unless i missed something: there
+shouldn't be a `.git` repository there.
+
+There are [various
+instructions](http://stackoverflow.com/questions/10637378/how-do-i-convert-a-bare-git-repository-into-a-normal-one-in-place)
+on how to do this online. They do seem to agree with the first comment
+above.
+
+Personnally, I would just `git clone` to a different repo and `git
+annex forget` the old one. Unless you have a very complex repository
+with a lot of files, this is simple enough... You could even use `git
+annex reinit` to recycle the previous uuid if that's a concern. So in
+short:
+
+ git clone repo.git repo
+ cd repo
+ git annex info --fast # find the UUID of repo.git
+ git annex move --from $UUID
+ git annex reinit $UUID
+
+Then `repo.git` can be removed if you are certain everything is
+correct in `repo`.
+
+Note that you may want to have backups of everything before you do
+anything, as usual.
+"""]]
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment b/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment
new file mode 100644
index 000000000..319b001f8
--- /dev/null
+++ b/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="Marco"
+ subject="A possible solution"
+ date="2015-05-19T11:03:22Z"
+ content="""
+While searching for the problem I found this:
+
+http://feeding.cloud.geek.nz/posts/error-while-running-git-gc/
+> git reflog expire --all --stale-fix
+
+I can't verify this because I nuked the broken repository after recreating it.
+"""]]
diff --git a/doc/bugs/keeps_demanding_ssh_key_even_if_all_sync__39__s_turned_down.mdwn b/doc/bugs/keeps_demanding_ssh_key_even_if_all_sync__39__s_turned_down.mdwn
new file mode 100644
index 000000000..adeb531e1
--- /dev/null
+++ b/doc/bugs/keeps_demanding_ssh_key_even_if_all_sync__39__s_turned_down.mdwn
@@ -0,0 +1,60 @@
+### Please describe the problem.
+
+May be I was simply wrong to assume that if I disable all sync'ing for all the repos, assistant wouldn't try to contact those remote hosts. But it still does
+
+In the logs, since no time stamp per each line, hard to say either recent ones just continuation of previous entries, or new ones:
+
+[[
+
+[2015-05-18 10:29:39 EDT] Watcher: Performing startup scan
+(started...) ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+ssh: connect to host vagus.cns.dartmouth.edu port 22: No route to host^M
+...
+]]
+
+and in another
+
+[[
+fsck xppaut_6.11b+1.dfsg.orig.tar.gz ok
+fsck xserver-xorg-input-synaptics_1.6.2+git44-ge28575b.orig.tar.gz ok
+fsck xserver-xorg-video-intel_2.99.917.orig.tar.gz (checksum...)
+ok
+(recording state in git...)
+ ** No known copies exist of python-mne_0.8.3+dfsg.orig.tar.gz
+git-annex: fsck: 1 failed
+
+(process:3954): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+Write failed: Broken pipe^M
+
+(process:20140): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+
+(process:20178): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+git-annex: Daemon is already running.
+
+(process:29035): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+
+(process:29184): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+
+(process:30127): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+
+(process:30817): Gtk-WARNING **: Locale not supported by C library.
+ Using the fallback 'C' locale.
+Write failed: Broken pipe^M
+]]
+
+that host (vagus) is RIP (need to remove from syncs)
+btw which are falling into daemon.log.1 not .log
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150509+gitga10e45d-1~ndall+1