Provide a tree summary after git-p4 rebase
Signed-off-by: Simon Hausmann <simon@lst.de>
Simon Hausmann committed
Apr 8, 2007 at 00:07 UTC
1f52af6c732bc17415474c426dc009f9e6a36a83
1 file changed
+3
-1
contrib/fast-import/git-p4
+3
-1
@@ -974,7 +974,7 @@ class P4Sync(Command):
974
if len(changes) == 0:
975
if not self.silent:
976
print "no changes to import!"
977
- sys.exit(1)
977
+ return True
978
979
cnt = 1
980
for change in changes:
@@ -1053,7 +1053,9 @@ class P4Rebase(Command):
1053
sync = P4Sync()
1054
sync.run([])
1055
print "Rebasing the current branch"
1056
+ oldHead = os.popen("git rev-parse HEAD").read()[:-1]
1057
system("git rebase p4")
1058
+ system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1059
return True
1060
1061
class HelpFormatter(optparse.IndentedHelpFormatter):