From: Simon Hausmann <simon@lst.de>
Date: Sat, 7 Apr 2007 22:07:02 +0000 (+0200)
Subject: Provide a tree summary after git-p4 rebase
X-Git-Tag: v1.5.3-rc0~65^2^2~140
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1f52af6c732bc17415474c426dc009f9e6a36a83;p=git.git

Provide a tree summary after git-p4 rebase

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index aa85800d6..170af90ab 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -974,7 +974,7 @@ class P4Sync(Command):
             if len(changes) == 0:
                 if not self.silent:
                     print "no changes to import!"
-                sys.exit(1)
+                return True
 
             cnt = 1
             for change in changes:
@@ -1053,7 +1053,9 @@ class P4Rebase(Command):
         sync = P4Sync()
         sync.run([])
         print "Rebasing the current branch"
+        oldHead = os.popen("git rev-parse HEAD").read()[:-1]
         system("git rebase p4")
+        system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
         return True
 
 class HelpFormatter(optparse.IndentedHelpFormatter):