diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-05 13:49:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-05 13:49:58 -0400 |
| commit | a43686b9847c19efebd1f15519083436ac155a8e (patch) | |
| tree | 98abed3386788da3002142a1053cdce09789c023 /CmdLine | |
| parent | 0ad42412dbc981969e0847b498701e6b9ca6dd17 (diff) | |
Simplify setup process for a ssh remote.
Now it suffices to run git remote add, followed by git-annex sync. Now the
remote is automatically initialized for use by git-annex, where before the
git-annex branch had to manually be pushed before using git-annex sync.
Note that this involved changes to git-annex-shell, so if the remote is
using an old version, the manual push is still needed.
Implementation required git-annex-shell be changed, so configlist can
autoinit a repository even when no git-annex branch has been pushed yet.
Unfortunate because we'll have to wait for it to get deployed to servers
before being able to rely on this change in the documentation.
Did consider making git-annex sync push the git-annex branch to repos that
didn't have a uuid, but this seemed difficult to do without complicating it
in messy ways.
It would be cleaner to split a command out from configlist to handle
the initialization. But this is difficult without sacrificing backwards
compatability, for users of old git-annex versions which would not use the
new command.
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitAnnexShell.hs | 3 | ||||
| -rw-r--r-- | CmdLine/GitAnnexShell/Fields.hs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs index 074257ac5..170548d1c 100644 --- a/CmdLine/GitAnnexShell.hs +++ b/CmdLine/GitAnnexShell.hs @@ -34,7 +34,7 @@ import qualified Command.GCryptSetup cmds_readonly :: [Command] cmds_readonly = - [ gitAnnexShellCheck Command.ConfigList.cmd + [ Command.ConfigList.cmd , gitAnnexShellCheck Command.InAnnex.cmd , gitAnnexShellCheck Command.SendKey.cmd , gitAnnexShellCheck Command.TransferInfo.cmd @@ -146,6 +146,7 @@ checkField (field, val) | field == fieldName remoteUUID = fieldCheck remoteUUID val | field == fieldName associatedFile = fieldCheck associatedFile val | field == fieldName direct = fieldCheck direct val + | field == fieldName autoInit = fieldCheck autoInit val | otherwise = False failure :: IO () diff --git a/CmdLine/GitAnnexShell/Fields.hs b/CmdLine/GitAnnexShell/Fields.hs index 93b048040..bc26df73f 100644 --- a/CmdLine/GitAnnexShell/Fields.hs +++ b/CmdLine/GitAnnexShell/Fields.hs @@ -34,3 +34,6 @@ associatedFile = Field "associatedfile" $ \f -> direct :: Field direct = Field "direct" $ \f -> f == "1" + +autoInit :: Field +autoInit = Field "autoinit" $ \f -> f == "1" |