Merge branch 'js/t4130-rename-without-ino'

diff --git a/git-p4.py b/git-p4.py
index b6593cf9a19144650cc476fae0243140f4c0a8bb..ac6f4c14fba8e459318d9e038327fbb34bea2361 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -2274,7 +2274,7 @@ def __init__(self):
         self.useClientSpec_from_options = False
         self.clientSpecDirs = None
         self.tempBranches = []
-        self.tempBranchLocation = "git-p4-tmp"
+        self.tempBranchLocation = "refs/git-p4-tmp"
         self.largeFileSystem = None
 
         if gitConfig('git-p4.largeFileSystem'):
@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path):
             return True
         hasPrefix = [p for p in self.branchPrefixes
                         if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix