xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diff

diff --git a/git-p4.py b/git-p4.py
index b123aa2726490403efef7d1aa32161ad05c42a4b..fd5ca524626c40823371422e52a3457fd1d45579 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1934,7 +1934,7 @@ def run(self, args):
         if self.useClientSpec:
             self.clientSpecDirs = getClientSpec()
 
-        # Check for the existance of P4 branches
+        # Check for the existence of P4 branches
         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
 
         if self.useClientSpec and not branchesDetected:
@@ -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'):