export: Deprecated the --tracking option.
Instead, users can configure remote.<name>.annex-tracking-branch themselves.
This commit is contained in:
		
					parent
					
						
							
								d805401708
							
						
					
				
			
			
				commit
				
					
						4747fa923d
					
				
			
		
					 5 changed files with 18 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -231,7 +231,7 @@ data RemoteGitConfig = RemoteGitConfig
 | 
			
		|||
	, remoteAnnexReadOnly :: Bool
 | 
			
		||||
	, remoteAnnexVerify :: Bool
 | 
			
		||||
	, remoteAnnexCheckUUID :: Bool
 | 
			
		||||
	, remoteAnnexExportTracking :: Maybe Git.Ref
 | 
			
		||||
	, remoteAnnexTrackingBranch :: Maybe Git.Ref
 | 
			
		||||
	, remoteAnnexTrustLevel :: Maybe String
 | 
			
		||||
	, remoteAnnexStartCommand :: Maybe String
 | 
			
		||||
	, remoteAnnexStopCommand :: Maybe String
 | 
			
		||||
| 
						 | 
				
			
			@ -287,8 +287,10 @@ extractRemoteGitConfig r remotename = do
 | 
			
		|||
		, remoteAnnexReadOnly = getbool "readonly" False
 | 
			
		||||
		, remoteAnnexCheckUUID = getbool "checkuuid" True
 | 
			
		||||
		, remoteAnnexVerify = getbool "verify" True
 | 
			
		||||
		, remoteAnnexExportTracking = Git.Ref
 | 
			
		||||
			<$> notempty (getmaybe "export-tracking")
 | 
			
		||||
		, remoteAnnexTrackingBranch = Git.Ref <$>
 | 
			
		||||
			( notempty (getmaybe "annex-tracking-branch")
 | 
			
		||||
			<|> notempty (getmaybe "export-tracking") -- old name
 | 
			
		||||
			)
 | 
			
		||||
		, remoteAnnexTrustLevel = notempty $ getmaybe "trustlevel"
 | 
			
		||||
		, remoteAnnexStartCommand = notempty $ getmaybe "start-command"
 | 
			
		||||
		, remoteAnnexStopCommand = notempty $ getmaybe "stop-command"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue