From 84264009b57f7ab0f44f8b709add12a576fa8efc Mon Sep 17 00:00:00 2001
From: Stephen Fromm <sfromm@gmail.com>
Date: Tue, 4 Dec 2012 17:02:54 -0800
Subject: [PATCH] Further refine remote branch tracking in b1ec6e8
Move operations that are dependant on a remote branch under a if
is_remote_branch() conditional. While at it, remove assignment to cmd
string in same block that wasn't used when calling _run().
---
git | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/git b/git
index b73d5cace29..05590c25f84 100644
--- a/git
+++ b/git
@@ -197,14 +197,14 @@ def switch_version(module, dest, remote, version):
os.chdir(dest)
cmd = ''
if version != 'HEAD':
- if not is_local_branch(module, dest, version) and is_remote_branch(module, dest, remote, version):
- cmd = "git checkout --track -b %s %s/%s" % (version, remote, version)
- elif is_local_branch(module, dest, version):
- cmd = "git checkout --force %s" % version
- (rc, out, err) = _run("git checkout --force %s" % version)
- if rc != 0:
- module.fail_json(msg="Failed to checkout branch %s" % version)
- cmd = "git reset --hard %s/%s" % (remote, version)
+ if is_remote_branch(module, dest, remote, version):
+ if not is_local_branch(module, dest, version):
+ cmd = "git checkout --track -b %s %s/%s" % (version, remote, version)
+ else:
+ (rc, out, err) = _run("git checkout --force %s" % version)
+ if rc != 0:
+ module.fail_json(msg="Failed to checkout branch %s" % version)
+ cmd = "git reset --hard %s/%s" % (remote, version)
else:
cmd = "git checkout --force %s" % version
else: