* [PATCH] Don't print "rebasing" if the head doesn't change
@ 2007-02-04 17:44 Pavel Roskin
2007-02-04 22:27 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Roskin @ 2007-02-04 17:44 UTC (permalink / raw)
To: git, Catalin Marinas
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Don't print "rebasing" if the head doesn't change
2007-02-04 17:44 [PATCH] Don't print "rebasing" if the head doesn't change Pavel Roskin
@ 2007-02-04 22:27 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2007-02-04 22:27 UTC (permalink / raw)
To: Pavel Roskin; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-04 22:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-04 17:44 [PATCH] Don't print "rebasing" if the head doesn't change Pavel Roskin
2007-02-04 22:27 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).