diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-28 19:47:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-28 19:47:05 -0400 |
| commit | 4a7e4aa126c1b8e28892188857b625ea65e185b6 (patch) | |
| tree | 2a417634ee0fdb466329f1b9f4581483d36c58dd | |
| parent | 2267cdea6e550880835d5c3bc3b2a51b4f890e70 (diff) | |
assistant --autostart: Refuse to start in a bare git repository.
| -rw-r--r-- | Command/Assistant.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs index 7a05cdfba..496df1dd2 100644 --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -19,7 +19,7 @@ import System.Environment def :: [Command] def = [noRepo checkAutoStart $ dontCheck repoExists $ withOptions options $ - command "assistant" paramNothing seek SectionCommon + notBareRepo $ command "assistant" paramNothing seek SectionCommon "automatically handle changes"] options :: [Option] diff --git a/debian/changelog b/debian/changelog index fc4b4bed3..f051484b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ git-annex (5.20140228) UNRELEASED; urgency=medium * Probe for quvi version at run time. * webapp: Filter out from Switch Repository list any repositories listed in autostart file that don't have a - git directory anymore. + git directory anymore. (Or are bare) * webapp: Refuse to start in a bare git repository. + * assistant --autostart: Refuse to start in a bare git repository. -- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400 |