mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-23 13:11:23 +02:00
Code

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

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2008-03-02 15:53:04 +00:00 committed by Junio C Hamano
parent 6dfbb304be
commit 5d02294c77
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-log.c
View File

@ -694,8 +694,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
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);

18
t/t4014-format-patch.sh
View File

@ -147,7 +147,7 @@ test_expect_success 'thread' '
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
'
@ -160,7 +160,7 @@ test_expect_success 'thread in-reply-to' '
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
'
@ -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 &&
grep "In-Reply-To: $FIRST_MID" $i
grep "In-Reply-To: $FIRST_MID" $i || break
done
'
@ -186,7 +186,7 @@ test_expect_success 'thread cover-letter in-reply-to' '
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
'
@ -201,4 +201,14 @@ test_expect_success 'excessive subject' '
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