diff options
author | Mike Frysinger <vapier@google.com> | 2020-02-17 14:36:08 -0500 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2020-02-19 00:24:43 +0000 |
commit | c58ec4dba102d88fec67e833eb8421202eb4c1ea (patch) | |
tree | c8c84e03f9359ae9dd126854069d34207c298831 /subcmds/rebase.py | |
parent | e1191b3adb22e0b406db87691b13ddab2c236267 (diff) | |
download | git-repo-c58ec4dba102d88fec67e833eb8421202eb4c1ea.tar.gz |
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 <vapier@google.com>
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r-- | subcmds/rebase.py | 4 |
1 files changed, 2 insertions, 2 deletions
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. | |||
53 | dest='force_rebase', action='store_true', | 53 | dest='force_rebase', action='store_true', |
54 | help='Pass --force-rebase to git rebase') | 54 | help='Pass --force-rebase to git rebase') |
55 | p.add_option('--no-ff', | 55 | p.add_option('--no-ff', |
56 | dest='no_ff', action='store_true', | 56 | dest='ff', default=True, action='store_false', |
57 | help='Pass --no-ff to git rebase') | 57 | help='Pass --no-ff to git rebase') |
58 | p.add_option('-q', '--quiet', | 58 | p.add_option('-q', '--quiet', |
59 | dest='quiet', action='store_true', | 59 | dest='quiet', action='store_true', |
@@ -93,7 +93,7 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
93 | common_args.append('--quiet') | 93 | common_args.append('--quiet') |
94 | if opt.force_rebase: | 94 | if opt.force_rebase: |
95 | common_args.append('--force-rebase') | 95 | common_args.append('--force-rebase') |
96 | if opt.no_ff: | 96 | if not opt.ff: |
97 | common_args.append('--no-ff') | 97 | common_args.append('--no-ff') |
98 | if opt.autosquash: | 98 | if opt.autosquash: |
99 | common_args.append('--autosquash') | 99 | common_args.append('--autosquash') |