From bf2d1832aa934d8f44102d5c9be0f84762da6763 Mon Sep 17 00:00:00 2001 From: w1r0x Date: Wed, 30 Sep 2015 15:23:48 +0300 Subject: [PATCH] Fixes #12309 --- bin/ansible-pull | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/ansible-pull b/bin/ansible-pull index d4887631e0f..6a3c7fbf4fd 100755 --- a/bin/ansible-pull +++ b/bin/ansible-pull @@ -140,6 +140,11 @@ def main(args): help='adds the hostkey for the repo url if not already added') parser.add_option('--key-file', dest='key_file', help="Pass '-i ' to the SSH arguments used by git.") + parser.add_option('--git-force', dest='gitforce', default=False, action='store_true', + help='modified files in the working git repository will be discarded') + parser.add_option('--track-submodules', dest='tracksubmodules', default=False, action='store_true', + help='submodules will track the latest commit on their master branch (or other branch specified in .gitmodules).' + ' This is equivalent to specifying the --remote flag to git submodule update') options, args = parser.parse_args(args) hostname = socket.getfqdn() @@ -182,6 +187,12 @@ def main(args): if options.key_file: repo_opts += ' key_file=%s' % options.key_file + if options.gitforce: + repo_opts += ' force=yes' + + if options.tracksubmodules: + repo_opts += ' track_submodules=yes' + path = utils.plugins.module_finder.find_plugin(options.module_name) if path is None: sys.stderr.write("module '%s' not found.\n" % options.module_name)