Signed-off-by: Pavel Roskin <proski@xxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html