"Pat Notz" <patnotz@xxxxxxxxx> writes:
> Signed-off-by: Pat Notz <patnotz@xxxxxxxxx>
> ---
> t/t7500-commit.sh | 33 +++++++++++++++++++++++++++++++++
> 1 files changed, 33 insertions(+), 0 deletions(-)
>
> diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
> index aa9c577..db82264 100755
> --- a/t/t7500-commit.sh
> +++ b/t/t7500-commit.sh
> @@ -215,4 +215,37 @@ test_expect_success 'Commit a message with --allow-empty-message' '
> commit_msg_is "hello there"
> '
>
> +commit_for_rebase_autosquash_setup() {
A SP after "_setup", i.e. "..._setup () {".
> + echo "first content for testing commit messages for rebase --autosquash" >>foo &&
Did you really need this long line here?
> + git add foo &&
> + cat >log <<EOF &&
> +target message subject line
> +
> +target message body line 1
> +target message body line 2
> +EOF
> + git commit -F log &&
> + echo "second content for testing commit messages for rebase --autosquash" >>foo &&
> + git add foo &&
> + git commit -m "intermediate commit" &&
> + echo "third content for testing commit messages for rebase --autosquash" >>foo &&
> + git add foo
> +}
> +
> +test_expect_success 'commit --fixup provides correct one-line commit message' '
> + commit_for_rebase_autosquash_setup &&
> + git commit --fixup HEAD~1 &&
> + commit_msg_is "fixup! target message subject line"
> +'
What should be the right output when "target message subject line" has
some metacharacters, i.e. "." (regexp) or "?" (glob)?
Don't we also want to make sure that "rebase --autosquash" correctly groks
the history you prepared in this test?
> +test_expect_success 'invalid message options when using --fixup' '
> + echo changes >>foo &&
> + echo "message" >log &&
> + git add foo &&
> + test_must_fail git commit --fixup HEAD~1 --C HEAD~2 &&
> + test_must_fail git commit --fixup HEAD~1 --c HEAD~2 &&
Double dashes before "C" and "c" look fishy. Don't.
> + test_must_fail git commit --fixup HEAD~1 -m "cmdline message" &&
> + test_must_fail git commit --fixup HEAD~1 -F log
> +'
> +
> test_done
> --
> 1.7.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html