diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-21 21:59:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-21 21:59:08 +0300 |
| commit | fbe959dde7eafcdae859e21cd734c07c7890c0a4 (patch) | |
| tree | 3a84214d3b1ca16b4e45a01c9e2270803a128f55 /t | |
| parent | 5498c57cdd637eb4f42ce8e296ce9ca4ab66e289 (diff) | |
| parent | 06dfc9ebaa154d5074b7afadc2f792a80fba7d0c (diff) | |
Merge branch 'bc/format-patch-null-from-line'
"format-patch" has learned a new option to zero-out the commit
object name on the mbox "From " line.
* bc/format-patch-null-from-line:
format-patch: check that header line has expected format
format-patch: add an option to suppress commit hash
sha1_file.c: introduce a null_oid constant
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 890db1174f..646c4750ec 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1431,4 +1431,18 @@ test_expect_success 'cover letter auto user override' ' test_line_count = 2 list ' +test_expect_success 'format-patch --zero-commit' ' + git format-patch --zero-commit --stdout v2..v1 >patch2 && + grep "^From " patch2 | sort | uniq >actual && + echo "From $_z40 Mon Sep 17 00:00:00 2001" >expect && + test_cmp expect actual +' + +test_expect_success 'From line has expected format' ' + git format-patch --stdout v2..v1 >patch2 && + grep "^From " patch2 >from && + grep "^From $_x40 Mon Sep 17 00:00:00 2001$" patch2 >filtered && + test_cmp from filtered +' + test_done |