Merge branch 'fc/maint-format-patch-pathspec-dashes'

Conflicts:
	t/t4014-format-patch.sh

diff --cc builtin-log.c
Simple merge

diff --cc t/t4014-format-patch.sh
index 7f267f9ed1d888eeb4b3c780a048c7d09e29db3b,437807e41ecf3fbde2b1b717960b4a384bc66bab..3bc1cccf8869aef26e175e207dc2923d3ddb1e65
--- 1/t/t4014-format-patch.sh
--- 2/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@@ -536,20 -515,9 +536,25 @@@ test_expect_success 'format-patch --sig
        grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
  '
  
 +echo "fatal: --name-only does not make sense" > expect.name-only
 +echo "fatal: --name-status does not make sense" > expect.name-status
 +echo "fatal: --check does not make sense" > expect.check
 +
 +test_expect_success 'options no longer allowed for format-patch' '
 +      test_must_fail git format-patch --name-only 2> output &&
 +      test_cmp expect.name-only output &&
 +      test_must_fail git format-patch --name-status 2> output &&
 +      test_cmp expect.name-status output &&
 +      test_must_fail git format-patch --check 2> output &&
 +      test_cmp expect.check output'
 +
 +test_expect_success 'format-patch --numstat should produce a patch' '
 +      git format-patch --numstat --stdout master..side > output &&
 +      test 6 = $(grep "^diff --git a/" output | wc -l)'
 +
+ test_expect_success 'format-patch -- <path>' '
+       git format-patch master..side -- file 2>error &&
+       ! grep "Use .--" error
+ '
+ 
  test_done