Ticket #10918: git.rb.patch

File git.rb.patch, 0.9 kB (added by nuttycom, 9 months ago)
Patch to use git checkout instead of branch & merge

a/lib/capistrano/recipes/deploy/scm/git.rb

old	new
117	117	execute = "#{git} clone #{configuration[:repository]} #{destination} && "
118	118	end
119	119
120		execute += "cd #{destination} && #{git} checkout ~~-b deploy~~ #{branch}"
	120	execute += "cd #{destination} && #{git} checkout #{branch}"
121	121
122	122	execute
123	123	end
…	…
128	128	execute = "cd #{destination} && git fetch origin && "
129	129
130	130	if head == 'HEAD'
131		execute += "git ~~merge~~ origin/HEAD"
	131	execute += "git checkout origin/HEAD"
132	132	else
133		execute += "git ~~merge~~ #{head}"
	133	execute += "git checkout #{head}"
134	134	end
135	135
136	136	execute