Re: [PATCH 1/2] Changed rebasing safety check to look for reachability of stack base (gna bug #9181).
From: David Kågedal <hidden>
Date: 2016-06-15 22:43:14
Yann Dirson [off-list ref] writes:
quoted hunk ↗ jump to hunk
--- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py@@ -77,16 +77,12 @@ def func(parser, options, args): check_conflicts() check_head_top_equal() - if policy == 'pull': - must_rebase = 0 - elif policy == 'fetch-rebase': - must_rebase = 1 - elif policy == 'rebase': - must_rebase = 1 - else: + if (policy != 'pull') \ + and (policy != 'fetch-rebase') \ + and (policy != 'rebase'): raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
Minor nit: I think this is much more clearly written as
if policy not in ('pull', 'fetch-rebase', 'rebase'):
--
David Kågedal