Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
baf07659
Commit
baf07659
authored
Jul 20, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #638 from sfromm/issue604
Fix for issue 604
parents
70ef8e9e
fd059a3d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
2 deletions
+1
-2
library/git
+1
-2
No files found.
library/git
View file @
baf07659
...
...
@@ -148,10 +148,9 @@ def pull(repo, dest, branch):
else
:
m
=
re
.
search
(
'^
\
s+
%
s$'
%
branch
,
gbranch_out
,
flags
=
re
.
M
)
#see if we've already checked it out
if
m
is
None
:
cmd
=
"git checkout -b
%
s origin/
%
s"
%
(
branch
,
branch
)
cmd
=
"git checkout -
-track -
b
%
s origin/
%
s"
%
(
branch
,
branch
)
else
:
(
out
,
err
)
=
switchLocalBranch
(
branch
)
cmd
=
"git pull -u origin"
cmd
=
subprocess
.
Popen
(
cmd
,
shell
=
True
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment