From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2016 20:22:24 +0000 (-0700)
Subject: Merge branch 'ls/p4-tmp-refs'
X-Git-Tag: v2.10.0-rc0~100
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36cafe44443fcca9eb35399ef0e9bfe289ec5dde?ds=inline;hp=-c

Merge branch 'ls/p4-tmp-refs'

"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
---

36cafe44443fcca9eb35399ef0e9bfe289ec5dde
diff --combined git-p4.py
index b123aa2726,6b252df816..ac6f4c14fb
--- a/git-p4.py
+++ 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'):
@@@ -2674,7 -2674,7 +2674,7 @@@
              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