diff --git a/gclient_scm.py b/gclient_scm.py
index 602b81e3eb..fd097a431c 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -759,8 +759,11 @@ class GitWrapper(SCMWrapper):
         # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
         # This allows devs to use experimental repos which have a different url
         # but whose branch(s) are the same as official repos.
-        if (current_url.rstrip('/') != url.rstrip('/') and url != 'git://foo'
-                and
+        strp_url = url[:-4] if url.endswith('.git') else url
+        strp_current_url = current_url[:-4] if current_url.endswith(
+            '.git') else current_url
+        if (strp_current_url.rstrip('/') != strp_url.rstrip('/')
+                and url != 'git://foo' and
                 subprocess2.capture([
                     'git', 'config',
                     'remote.%s.gclient-auto-fix-url' % self.remote