mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format-patch: improve head calculation for cover-letter

Browse Source 
If we do it after the revision traversal we can be sure that this is
indeed a commit that will be processed (i.e. not a merge) and it's the
top most one (thus removing the NEEDSWORK comment, at least we show the
same as 'git diff --stat' output that appears in the cover-letter).

While we are at it, since we know there's nothing to generate, exit
sooner in all cases, like --cover-letter currently does.

Also, if there's nothing to generate and cover-letter is specified, a
different code-path might be triggered that is not currently covered in
the test-case, so add a test for it.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2013-04-07 12:46:20 -05:00
committed by Junio C Hamano
parent 402596aafa
commit 80d35ca0aa
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1284,4 +1284,9 @@ test_expect_success 'cover letter using branch description (6)' '
grep hello actual >/dev/null
'
test_expect_success 'cover letter with nothing' '
git format-patch --stdout --cover-letter >actual &&
test_line_count = 0 actual
'
test_done