split-index: do not invalidate cache-tree at read time

diff --git a/git-p4.py b/git-p4.py
index 26b874fec969959d51df083d86b286df173e19c5..8d11b25ae37761a9cfea263bd9a5591c0495fc1c 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1871,7 +1871,7 @@ def update_client_spec_path_cache(self, files):
                 # assume error is "... file(s) not in client view"
                 continue
             if "clientFile" not in res:
-                die("No clientFile from 'p4 where %s'" % depot_path)
+                die("No clientFile in 'p4 where' output")
             if "unmap" in res:
                 # it will list all of them, but only one not unmap-ped
                 continue
@@ -3086,7 +3086,7 @@ def rebase(self):
         print "Rebasing the current branch onto %s" % upstream
         oldHead = read_pipe("git rev-parse HEAD").strip()
         system("git rebase %s" % upstream)
-        system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
+        system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
         return True
 
 class P4Clone(P4Sync):