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

Pavel Roskin· Feb 4, 2007, 17:44 UTC · lore

Signed-off-by: Pavel Roskin <proski@gnu.org>
---
Please ignore previous version of this patch; it was buggy.
---

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

Show changes to stgit/commands/pull.py +4 −2

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index b63ef7a..2d4a782 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())
+        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

Catalin Marinas· Feb 4, 2007, 22:27 UTC · re: Pavel Roskin · lore

Re: [PATCH] Don't print "rebasing" if the head doesn't change

On 04/02/07, Pavel Roskin <proski@gnu.org> wrote:

> Signed-off-by: Pavel Roskin <proski@gnu.org>
> ---
> Please ignore previous version of this patch; it was buggy.

Applied, thanks.

-- 
Catalin

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