kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Provide a tree summary after git-p4 rebase 

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 2007-04-08 00:07:02 +02:00
parent 01ce1fe967
commit 1f52af6c73
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/fast-import/git-p4
View File

@ -974,7 +974,7 @@ class P4Sync(Command):
if len(changes) == 0: if len(changes) == 0:
if not self.silent: if not self.silent:
print "no changes to import!" print "no changes to import!"
sys.exit(1) return True


cnt = 1 cnt = 1
for change in changes: for change in changes:
@ -1053,7 +1053,9 @@ class P4Rebase(Command):
sync = P4Sync() sync = P4Sync()
sync.run([]) sync.run([])
print "Rebasing the current branch" print "Rebasing the current branch"
oldHead = os.popen("git rev-parse HEAD").read()[:-1]
system("git rebase p4") system("git rebase p4")
system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
return True return True


class HelpFormatter(optparse.IndentedHelpFormatter): class HelpFormatter(optparse.IndentedHelpFormatter):