chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0579dae
)
Don't print "rebasing" if the head doesn't change
author
Pavel Roskin
<proski@gnu.org>
Sun, 4 Feb 2007 17:44:03 +0000
(12:44 -0500)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Sun, 4 Feb 2007 22:23:23 +0000
(22:23 +0000)
Signed-off-by: Pavel Roskin <proski@gnu.org>
stgit/commands/pull.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index b63ef7a55ed7d197aaec53e8ebd84b34e303db61..2d4a78242d29f3276ab4743548ae6744ac3b5d4e 100644
(file)
--- 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