From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 1/2] Correctly check the pull-does-rebase parameter in 'stg pull'.
Date: Sat, 03 Feb 2007 17:04:20 +0100 [thread overview]
Message-ID: <20070203160420.32054.20462.stgit@gandelf.nowhere.earth> (raw)
In-Reply-To: <20070203160257.32054.17787.stgit@gandelf.nowhere.earth>
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
stgit/commands/pull.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 15bbed6..330cc25 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -72,7 +72,8 @@ def func(parser, options, args):
# pull the remote changes
print 'Pulling from "%s"...' % repository
git.fetch(repository)
- if (config.get('stgit.pull-does-rebase')):
+ if (config.get('stgit.pull-does-rebase') == 'yes'):
+ print "rebasing to '%s'..." % crt_series.get_parent_branch()
git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
print 'done'
next prev parent reply other threads:[~2007-02-03 16:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 16:04 [PATCH 0/2] Minor stgit touches Yann Dirson
2007-02-03 16:04 ` Yann Dirson [this message]
2007-02-03 16:04 ` [PATCH 2/2] Warn the user when there is no parent information in the config Yann Dirson
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=20070203160420.32054.20462.stgit@gandelf.nowhere.earth \
--to=ydirson@altern.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 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).