Commits

Michał Górny committed 11523f6

[git-2] Drop EGIT_OPTIONS, they're only for clone.

Comments (0)

Files changed (1)

SmartLiveRebuild/vcs/git_2.py

 
 class GitSupport(VCSSupport):
 	reqenv = ['EGIT_BRANCH', 'EGIT_DIR', 'EGIT_UPDATE_CMD']
-	optenv = ['EGIT_COMMIT', 'EGIT_HAS_SUBMODULES', 'EGIT_OPTIONS', 'EGIT_REPO_URI', 'EGIT_VERSION']
+	optenv = ['EGIT_COMMIT', 'EGIT_HAS_SUBMODULES', 'EGIT_REPO_URI', 'EGIT_VERSION']
 
 	def __init__(self, *args):
 		VCSSupport.__init__(self, *args)
 
 	def getupdatecmd(self):
 		if self.env['EGIT_HAS_SUBMODULES']:
-			upcmd = ['%s %s' % (self.env['EGIT_UPDATE_CMD'], self.env['EGIT_OPTIONS'])]
+			upcmd = [self.env['EGIT_UPDATE_CMD']]
 			upcmd += ['git submodule %s' % x for x in ('init', 'sync', 'update')]
 			return ' && '.join(upcmd)
 		else:
-			return '%s %s origin %s:%s' % (self.env['EGIT_UPDATE_CMD'], self.env['EGIT_OPTIONS'], self.env['EGIT_BRANCH'], self.env['EGIT_BRANCH'])
+			return '%s origin %s:%s' % (self.env['EGIT_UPDATE_CMD'], self.env['EGIT_BRANCH'], self.env['EGIT_BRANCH'])
 
 	def diffstat(self, oldrev, newrev):
 		subprocess.Popen('%s %s..%s' % ('git diff', oldrev, newrev), stdout=sys.stderr, shell=True).wait()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.