format-patch: use the diff options for the cover letter, too

Earlier, when you called "git format-patch --cover-letter -M", the
diffstat in the cover letter would not inherit the "-M".  Now it does.

While at it, add a few "|| break" statements in the test's loops;
otherwise, breakages inside the loops would not be caught.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-log.c b/builtin-log.c
index bbadbc0de2fe1a2c85f3488420172a4db2ab6b4a..fd9b3ae95ea8da03780f93382dd817a11cdbb9f3 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -694,8 +694,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
        if (!origin)
                return;
 
        if (!origin)
                return;
 

-       diff_setup(&opts);
-       opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
+       memcpy(&opts, &rev->diffopt, sizeof(opts));
+       opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;

 
        diff_setup_done(&opts);
 
 
        diff_setup_done(&opts);
 

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 16aa99dc0dbe1fe7e09aa046dfc2dc1ec652963c..6d86b7dd7293cbff093944a01931a5e61ccfe926 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -147,7 +147,7 @@ test_expect_success 'thread' '
        for i in patches/0002-* patches/0003-*
        do
          grep "References: $FIRST_MID" $i &&
        for i in patches/0002-* patches/0003-*
        do
          grep "References: $FIRST_MID" $i &&

-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break

        done
 '
 
        done
 '
 


@@ -160,7 +160,7 @@ test_expect_success 'thread in-reply-to' '
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&

-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break

        done
 '
 
        done
 '
 


@@ -173,7 +173,7 @@ test_expect_success 'thread cover-letter' '
        for i in patches/0001-* patches/0002-* patches/0003-* 
        do
          grep "References: $FIRST_MID" $i &&
        for i in patches/0001-* patches/0002-* patches/0003-* 
        do
          grep "References: $FIRST_MID" $i &&

-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break

        done
 '
 
        done
 '
 


@@ -186,7 +186,7 @@ test_expect_success 'thread cover-letter in-reply-to' '
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&

-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break

        done
 '
 
        done
 '
 


@@ -201,4 +201,14 @@ test_expect_success 'excessive subject' '
        ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 '
 
        ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 '
 

+test_expect_success 'cover-letter inherits diff options' '
+
+       git mv file foo &&
+       git commit -m foo &&
+       git format-patch --cover-letter -1 &&
+       ! grep "file => foo .* 0 *$" 0000-cover-letter.patch &&
+       git format-patch --cover-letter -1 -M &&
+       grep "file => foo .* 0 *$" 0000-cover-letter.patch
+
+'

 test_done
 test_done