From c58ec4dba102d88fec67e833eb8421202eb4c1ea Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 17 Feb 2020 14:36:08 -0500 Subject: avoid negative variables Trying to use booleans with names like "no_xxx" are hard to follow due to the double negatives. Invert all of them so we only have positive meanings to follow. Change-Id: Ifd37d0368f97034d94aa2cf38db52c723ac0c6ed Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255493 Tested-by: Mike Frysinger Reviewed-by: David Pursehouse --- subcmds/rebase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'subcmds/rebase.py') diff --git a/subcmds/rebase.py b/subcmds/rebase.py index eb92a3c7..24d80bfd 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -53,7 +53,7 @@ branch but need to incorporate new upstream changes "underneath" them. dest='force_rebase', action='store_true', help='Pass --force-rebase to git rebase') p.add_option('--no-ff', - dest='no_ff', action='store_true', + dest='ff', default=True, action='store_false', help='Pass --no-ff to git rebase') p.add_option('-q', '--quiet', dest='quiet', action='store_true', @@ -93,7 +93,7 @@ branch but need to incorporate new upstream changes "underneath" them. common_args.append('--quiet') if opt.force_rebase: common_args.append('--force-rebase') - if opt.no_ff: + if not opt.ff: common_args.append('--no-ff') if opt.autosquash: common_args.append('--autosquash') -- cgit v1.2.3-54-g00ecf