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
8d85b27a
Commit
8d85b27a
authored
Mar 20, 2013
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2472 from sfromm/issue2471
Fixes for get_remote_head in git module
parents
92997ec7
b694b9a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
6 deletions
+34
-6
library/git
+34
-6
No files found.
library/git
View file @
8d85b27a
...
...
@@ -104,16 +104,33 @@ def reset(module,dest,force):
return
module
.
run_command
(
"git reset --hard HEAD"
,
check_rc
=
True
)
def
get_remote_head
(
module
,
dest
,
version
,
remote
):
cmd
=
''
os
.
chdir
(
dest
)
if
version
==
'HEAD'
:
version
=
get_head_branch
(
module
,
dest
,
remote
)
os
.
chdir
(
dest
)
cmd
=
"git ls-remote
%
s -h refs/heads/
%
s"
%
(
remote
,
version
)
if
is_remote_branch
(
module
,
dest
,
remote
,
version
):
cmd
=
'git ls-remote
%
s -h refs/heads/
%
s'
%
(
remote
,
version
)
elif
is_remote_tag
(
module
,
dest
,
remote
,
version
):
cmd
=
'git ls-remote
%
s -t refs/tags/
%
s'
%
(
remote
,
version
)
else
:
# appears to be a sha1. return as-is since it appears
# cannot check for a specific sha1 on remote
return
version
(
rc
,
out
,
err
)
=
module
.
run_command
(
cmd
,
check_rc
=
True
)
if
len
(
out
)
<
1
:
module
.
fail_json
(
msg
=
"Could not determine remote revision for
%
s"
%
version
)
rev
=
out
.
split
()[
0
]
return
rev
def
is_remote_tag
(
module
,
dest
,
remote
,
version
):
os
.
chdir
(
dest
)
cmd
=
'git ls-remote
%
s -t refs/tags/
%
s'
%
(
remote
,
version
)
(
rc
,
out
,
err
)
=
module
.
run_command
(
cmd
)
if
version
in
out
:
return
True
else
:
return
False
def
get_branches
(
module
,
dest
):
os
.
chdir
(
dest
)
branches
=
[]
...
...
@@ -270,11 +287,22 @@ def main():
# check or get changes from remote
remote_head
=
get_remote_head
(
module
,
dest
,
version
,
remote
)
if
module
.
check_mode
:
remote_head
=
remote_head
[
0
:
7
]
if
before
!=
remote_head
:
module
.
exit_json
(
changed
=
True
,
before
=
before
,
after
=
remote_head
)
changed
=
False
if
remote_head
==
version
:
# get_remote_head returned version as-is
# were given a sha1 object, see if it is present
(
rc
,
out
,
err
)
=
module
.
run_command
(
"git show
%
s"
%
version
)
if
version
in
out
:
changed
=
False
else
:
changed
=
True
else
:
module
.
exit_json
(
changed
=
False
,
before
=
before
,
after
=
remote_head
)
remote_head
=
remote_head
[
0
:
7
]
if
before
!=
remote_head
:
changed
=
True
else
:
changed
=
False
module
.
exit_json
(
changed
=
changed
,
before
=
before
,
after
=
remote_head
)
(
rc
,
out
,
err
)
=
fetch
(
module
,
repo
,
dest
,
version
,
remote
)
if
rc
!=
0
:
module
.
fail_json
(
msg
=
err
)
...
...
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