"Joel Klinghed via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 190d215d43b..4c5286840c5 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1333,7 +1333,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
> } else {
> fixup_commit = fixup_message;
> fixup_prefix = "fixup";
> - use_editor = 0;
> + if (0 > edit_flag)
Writing this as
if (edit_flag < 0)
makes it far easier to immediately see that we are talking about a
nagetive edit_flag.
> + use_editor = 0;
> }
> }
>
> diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
> index 7d02f79c0de..d71c7812180 100755
> --- a/t/t7500-commit-template-squash-signoff.sh
> +++ b/t/t7500-commit-template-squash-signoff.sh
> @@ -281,6 +281,21 @@ test_expect_success 'commit --fixup -m"something" -m"extra"' '
>
> extra"
> '
> +test_expect_success 'commit --fixup --edit' '
> + commit_for_rebase_autosquash_setup &&
> + cat >e-append <<-\EOF &&
> + #!/bin/sh
> + sed -e "2a\\
> +something\\
> +extra" <"$1" >"$1-"
> + mv "$1-" "$1"
> + EOF
> + chmod 755 e-append &&
Use write_script helper from test-lib-functions.sh here and lose the
hardcoded reference to /bin/sh.
> + EDITOR="./e-append" git commit --fixup HEAD~1 --edit &&
> + commit_msg_is "fixup! target message subject linesomething
> +extra"
> +'
Thanks.
