All of lore.kernel.org
 help / color / mirror / Atom feed
From: "David Kågedal" <davidk@lysator.liu.se>
To: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Changed rebasing safety check to look for reachability of stack base (gna bug #9181).
Date: Mon, 04 Jun 2007 15:42:22 +0200	[thread overview]
Message-ID: <878xazbzup.fsf@morpheus.local> (raw)
In-Reply-To: 20070603134152.1681.82748.stgit@gandelf.nowhere.earth

Yann Dirson <ydirson@altern.org> writes:

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

  reply	other threads:[~2007-06-04 13:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-03 13:41 [StGIT RFC PATCH 0/2] Fixing the rebase safeguard Yann Dirson
2007-06-03 13:41 ` [PATCH 1/2] Changed rebasing safety check to look for reachability of stack base (gna bug #9181) Yann Dirson
2007-06-04 13:42   ` David Kågedal [this message]
2007-06-03 13:41 ` [PATCH 2/2] Test "stg rebase" after "stg commit" Yann Dirson
2007-06-04 22:41 ` [StGIT RFC PATCH 0/2] Fixing the rebase safeguard Catalin Marinas

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=878xazbzup.fsf@morpheus.local \
    --to=davidk@lysator.liu.se \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.