diff options
| author |  Simon Hausmann <simon@lst.de> | 2007-04-08 00:07:02 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-04-08 00:07:02 +0200 |
| commit | 1f52af6c732bc17415474c426dc009f9e6a36a83 (patch) | |
| tree | 836de2ca2dc50b0cc788b4f1f0d4baf47e78e0a5 | |
| parent | Added git-p4 rebase convenience (diff) | |
| download | tgif-1f52af6c732bc17415474c426dc009f9e6a36a83.tar.xz | |
Provide a tree summary after git-p4 rebase
Signed-off-by: Simon Hausmann <simon@lst.de>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index aa85800d69..170af90abc 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): |