All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Roskin <proski@gnu.org>
To: git@vger.kernel.org, Catalin Marinas <catalin.marinas@gmail.com>
Subject: [PATCH 3/4] Don't print "rebasing" if the head doesn't change
Date: Sun, 04 Feb 2007 00:32:31 -0500	[thread overview]
Message-ID: <20070204053231.15035.4631.stgit@dv.roinet.com> (raw)
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

  parent reply	other threads:[~2007-02-04  5:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-04  5:32 [PATCH 1/4] Rename branch section in config when the branch is renamed Pavel Roskin
2007-02-04  5:32 ` [PATCH 2/4] Copy remote and merge settings when cloning a branch Pavel Roskin
2007-02-04  5:32 ` Pavel Roskin [this message]
2007-02-04  5:32 ` [PATCH 4/4] Assorted typos Pavel Roskin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070204053231.15035.4631.stgit@dv.roinet.com \
    --to=proski@gnu.org \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.