Don't print "rebasing" if the head doesn't change

Signed-off-by: Pavel Roskin <proski@gnu.org>

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index b63ef7a55ed7d197aaec53e8ebd84b34e303db61..2d4a78242d29f3276ab4743548ae6744ac3b5d4e 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -73,8 +73,10 @@ def func(parser, options, args):
     print 'Pulling from "%s"...' % repository
     git.fetch(repository)
     if (config.get('stgit.pull-does-rebase') == 'yes'):
     print 'Pulling from "%s"...' % repository
     git.fetch(repository)
     if (config.get('stgit.pull-does-rebase') == 'yes'):

-        print 'rebasing to "%s"...' % git.fetch_head()
-        git.reset(tree_id = git.fetch_head())
+        fetch_head = git.fetch_head()
+        if fetch_head != git.get_head():
+            print 'rebasing to "%s"...' % fetch_head
+            git.reset(tree_id = fetch_head)

     print 'done'
 
     # push the patches back
     print 'done'
 
     # push the patches back