{"thread":{"id":"6678","subject":"[PATCH] Don't print \"rebasing\" if the head doesn't change","startedAt":"2007-02-04T17:44:03Z","lastAt":"2007-02-04T22:27:01Z","messageCount":2,"participants":["Pavel Roskin","Catalin Marinas"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33578","messageId":"20070204174403.7926.29304.stgit@dv.roinet.com","threadId":"6678","inReplyTo":null,"subject":"[PATCH] Don't print \"rebasing\" if the head doesn't change","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-02-04T17:44:03Z","receivedAt":"2007-02-04T17:44:03Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Signed-off-by: Pavel Roskin <proski@gnu.org>\n---\nPlease ignore previous version of this patch; it was buggy.\n---\n\n stgit/commands/pull.py |    6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/stgit/commands/pull.py b/stgit/commands/pull.py\nindex b63ef7a..2d4a782 100644\n--- a/stgit/commands/pull.py\n+++ b/stgit/commands/pull.py\n@@ -73,8 +73,10 @@ def func(parser, options, args):\n     print 'Pulling from \"%s\"...' % repository\n     git.fetch(repository)\n     if (config.get('stgit.pull-does-rebase') == 'yes'):\n-        print 'rebasing to \"%s\"...' % git.fetch_head()\n-        git.reset(tree_id = git.fetch_head())\n+        fetch_head = git.fetch_head()\n+        if fetch_head != git.get_head():\n+            print 'rebasing to \"%s\"...' % fetch_head\n+            git.reset(tree_id = fetch_head)\n     print 'done'\n \n     # push the patches back\n"},{"id":"33593","messageId":"b0943d9e0702041427v655abd96oe44515f0942c7812@mail.gmail.com","threadId":"6678","inReplyTo":"20070204174403.7926.29304.stgit@dv.roinet.com","subject":"Re: [PATCH] Don't print \"rebasing\" if the head doesn't change","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-02-04T22:27:01Z","receivedAt":"2007-02-04T22:27:01Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 04/02/07, Pavel Roskin <proski@gnu.org> wrote:\n> Signed-off-by: Pavel Roskin <proski@gnu.org>\n> ---\n> Please ignore previous version of this patch; it was buggy.\n\nApplied, thanks.\n\n-- \nCatalin\n"}]}