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

From

Junio C Hamano <gitster@pobox.com>

Date

Aug 21, 2013, 22:44 UTC

Message-ID

<xmqqwqneslyf.fsf@gitster.dls.corp.google.com>

In-Reply-To

<1377110937-13439-1-git-send-email-ralf.thielow@gmail.com>

Ralf Thielow <ralf.thielow@gmail.com> writes:

> 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>
> ---

Thanks; will queue with the following squashed-in.

 t/t3409-rebase-preserve-merges.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 2454811..8c251c5 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -113,10 +113,8 @@ 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
-	git log --format="%b" -1 >current
+	echo >expected &&
+	git log --format="%b" -1 >current &&
 	test_cmp expected current
 	)
 '