diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 43152dbae0..a075d86c75 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -731,7 +731,7 @@ from :3
          '________ running \'git clone -b master --verbose %s %s\' in \'%s\'\n'
          'Initialized empty Git repository in %s\n') %
             (join(self.root_dir, '.', '.git'), join(root_dir, 'foo'), root_dir,
-             join(root_dir, 'foo', '.git') + '/'))
+             join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/'))
 
   def testUpdateUpdate(self):
     if not self.enabled:
diff --git a/trychange.py b/trychange.py
index c381b1058d..1cc6ac9573 100755
--- a/trychange.py
+++ b/trychange.py
@@ -114,18 +114,19 @@ class SCM(object):
     Uses gcl-style settings from the repository.
     """
     if gcl:
-      return gcl.GetCodeReviewSetting(key)
-    else:
-      if self.codereview_settings is None:
-        self.codereview_settings = {}
-        settings_file = self.ReadRootFile(self.codereview_settings_file)
-        if settings_file:
-          for line in settings_file.splitlines():
-            if not line or line.lstrip().startswith('#'):
-              continue
-            k, v = line.split(":", 1)
-            self.codereview_settings[k.strip()] = v.strip()
-      return self.codereview_settings.get(key, '')
+      gcl_setting = gcl.GetCodeReviewSetting(key)
+      if gcl_setting != '':
+        return gcl_setting
+    if self.codereview_settings is None:
+      self.codereview_settings = {}
+      settings_file = self.ReadRootFile(self.codereview_settings_file)
+      if settings_file:
+        for line in settings_file.splitlines():
+          if not line or line.lstrip().startswith('#'):
+            continue
+          k, v = line.split(":", 1)
+          self.codereview_settings[k.strip()] = v.strip()
+    return self.codereview_settings.get(key, '')
 
   def _GclStyleSettings(self):
     """Set default settings based on the gcl-style settings from the