Re: [PATCH 1/2] Changed rebasing safety check to look for reachability of stack base (gna bug #9181).

From: David Kågedal <davidk@lysator.liu.se>
Date: Jun 4, 2007, 13:42 UTC
Message-ID: <878xazbzup.fsf@morpheus.local>
In-Reply-To: <20070603134152.1681.82748.stgit@gandelf.nowhere.earth>

Yann Dirson <ydirson@altern.org> writes:

Show 17 quoted lines

> --- 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