combine-diff: extend --cc logic to Octopus.

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 7e67c4e403f48be282e934586faa93a36e5f1ad8..5fb8ce1fbc6e067cdd3c3723b8524df72225632e 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -178,7 +178,7 @@ my ($signoff_pattern, $done_header, $done_subject, $signoff_seen,
     $last_was_signoff);
 
 if ($signoff) {
-       $signoff = `git-var GIT_COMMITTER_IDENT`;
+       $signoff = "Signed-off-by: " . `git-var GIT_COMMITTER_IDENT`;
        $signoff =~ s/>.*/>/;
        $signoff_pattern = quotemeta($signoff);
 }