[PATCH 3/4] Don't print "rebasing" if the head doesn't change

From

PRPavel Roskin <proski@gnu.org>

Date

Feb 4, 2007, 05:32 UTC

Message-ID

<20070204053231.15035.4631.stgit@dv.roinet.com>

In-Reply-To

<20070204053221.15035.88015.stgit@dv.roinet.com>

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

 stgit/commands/pull.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index b63ef7a..0aee6bf 100644
--- 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 'rebasing to "%s"...' % git.fetch_head()
-        git.reset(tree_id = git.fetch_head())
+        tree_id = git.fetch_head()
+        if tree_id != git.get_head():
+            print 'rebasing to "%s"...' % tree_id
+            git.reset(tree_id)
     print 'done'
 
     # push the patches back