Merge branch 'ls/p4-tmp-refs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:24 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:24 +0000 (13:22 -0700)
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.

* ls/p4-tmp-refs:
git-p4: place temporary refs used for branch import under refs/git-p4-tmp

1  2 
git-p4.py
diff --combined git-p4.py
index b123aa2726490403efef7d1aa32161ad05c42a4b,6b252df816752be640021fad95e1ed720987bf03..ac6f4c14fba8e459318d9e038327fbb34bea2361
+++ b/git-p4.py
@@@ -2274,7 -2274,7 +2274,7 @@@ class P4Sync(Command, P4UserMap)
          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'):
              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