From a8fe6bb102932250c105b60839f9437438dcbf83 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Thu, 22 Jun 2023 17:51:29 -0700 Subject: [PATCH] amend: Fix double negative in no-edit Otherwise in order to run with edit false by default and manually setting it to true, you'd be passing in --no-no-edit which is silly. --- revup/amend.py | 6 +++--- revup/revup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/revup/amend.py b/revup/amend.py index df9ba2b..960356c 100644 --- a/revup/amend.py +++ b/revup/amend.py @@ -111,9 +111,9 @@ async def get_has_unstaged() -> bool: ) has_diff = has_staged or has_unstaged or args.drop - if not has_diff and args.no_edit: + if not has_diff and not args.edit: return 0 - if args.insert and args.no_edit: + if args.insert and not args.edit: raise RevupUsageException("Can't skip wording an inserted commit!") if args.drop and args.insert: @@ -164,7 +164,7 @@ async def get_has_unstaged() -> bool: stack[0].committer_date = "" stack[0].commit_msg = "" - if not args.no_edit and not args.drop: + if args.edit and not args.drop: new_msg = invoke_editor_for_commit_msg( git_ctx, git_ctx.editor, diff --git a/revup/revup.py b/revup/revup.py index 0e78589..8faa062 100755 --- a/revup/revup.py +++ b/revup/revup.py @@ -270,7 +270,7 @@ async def main() -> int: restack_parser.add_argument("--topicless-last", "-t", action="store_true") amend_parser.add_argument("ref_or_topic", nargs="?") - amend_parser.add_argument("--no-edit", "--skip-reword", "-s", action="store_true") + amend_parser.add_argument("--edit", "-s", default=True, action="store_true") amend_parser.add_argument("--insert", "-i", action="store_true") amend_parser.add_argument("--drop", "-d", action="store_true") amend_parser.add_argument("--all", "-a", action="store_true")