diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/assistant/release_notes.mdwn | 9 | ||||
| -rw-r--r-- | doc/bugs/How_can_I_solve_a_non-fast-forward_push_without_using_the_assistant__63__.mdwn | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5c28b729a..c09605cb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (4.20131025) UNRELEASED; urgency=low * assistant: When autostarted, wait 5 seconds before running the startup scan, to avoid contending with the user's desktop login process. + * webapp: When setting up a bare shared repository, enable non-fast-forward + pushes. -- Joey Hess <joeyh@debian.org> Sat, 26 Oct 2013 12:11:48 -0400 diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn index 1b1ece0a0..b7f61c373 100644 --- a/doc/assistant/release_notes.mdwn +++ b/doc/assistant/release_notes.mdwn @@ -1,3 +1,12 @@ +## 4.20131025 + +Note that all past versions of the assistant, when used to create a +git repository on a ssh server, set up the repository in a way that +prevents `git annex sync` from working (although the assistant can sync +with it). To fix this misconfiguration, you can ssh to the server +and run this command inside the bare git repository: +`git config receive.denyNonFastforwards false` + ## version 4.20131024 This version fixes several different bugs that could cause the webapp to diff --git a/doc/bugs/How_can_I_solve_a_non-fast-forward_push_without_using_the_assistant__63__.mdwn b/doc/bugs/How_can_I_solve_a_non-fast-forward_push_without_using_the_assistant__63__.mdwn index 5a1552c82..69b0c4116 100644 --- a/doc/bugs/How_can_I_solve_a_non-fast-forward_push_without_using_the_assistant__63__.mdwn +++ b/doc/bugs/How_can_I_solve_a_non-fast-forward_push_without_using_the_assistant__63__.mdwn @@ -285,3 +285,11 @@ Everything up-to-date # End of transcript or log. """]] + +> So, receive.denyNonFastforwards was the problem. It turns out that +> `git init --bare --shared` sets that by default, and the webapp +> uses that to create repositories on ssh server. I have made the webapp +> unset receive.denyNonFastforwards when setting up such a repository. +> +> Also added something to the assistant release notes about this +> to handle existing repositories. [[done]] --[[Joey]] |