Merge pull request #12571 from w1r0x/feat-git-ansible-pull-options

Fixes #12309

1 files changed, 11 insertions, 0 deletions

diff --git a/bin/ansible-pull b/bin/ansible-pull
index d4887631e0..6a3c7fbf4f 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 <key_file>' 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)