Re: [PATCH] rebase --preserve-merges: ignore "merge.log" config

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Aug 21, 2013, 20:22 UTC
Message-ID: <CAPig+cTWgaMLLUBEetAQnNG2U34d8YgYPSSNds4oFim4uB=2WA@mail.gmail.com>
In-Reply-To: <1377110937-13439-1-git-send-email-ralf.thielow@gmail.com>

On Wed, Aug 21, 2013 at 2:48 PM, Ralf Thielow <ralf.thielow@gmail.com> wrote:

Show 27 quoted lines

> When "merge.log" config is set, "rebase --preserve-merges"
> will add the log lines to the message of the rebased merge
> commit.
>
> A rebase should not modify a commit message automatically.
>
> Teach "git-rebase" to ignore that configuration by passing "--no-log"
> to the git-merge call.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
> index 2e0c364..2454811 100755
> --- a/t/t3409-rebase-preserve-merges.sh
> +++ b/t/t3409-rebase-preserve-merges.sh
> @@ -96,4 +108,17 @@ test_expect_success 'rebase -p preserves no-ff merges' '
>         )
>  '
>
> +test_expect_success 'rebase -p ignores merge.log config' '
> +       (
> +       cd clone4 &&
> +       git fetch &&
> +       git -c merge.log=1 rebase -p origin/topic &&
> +       cat >expected <<-\EOF &&
> +
> +       EOF

This might be clearer with a simple 'echo' instead of 'cat' with heredoc:

  echo >expected &&

Show 8 quoted lines

> +       git log --format="%b" -1 >current
> +       test_cmp expected current
> +       )
> +'
> +
>  test_done
> --
> 1.8.4.rc4.dirty