diff options
| author | justins <justins@web> | 2013-12-26 21:09:00 -0400 |
|---|---|---|
| committer | admin <admin@branchable.com> | 2013-12-26 21:09:00 -0400 |
| commit | 85e97bd9753676f261449a1dbbaeb0dc038bb91e (patch) | |
| tree | 1b202c2c3c74bff06e7e5b8fa8a223f6b0f9150a /doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn | |
| parent | 345029b9888a268280ae37e69e15e1eaa3220755 (diff) | |
| download | ikiwiki-85e97bd9753676f261449a1dbbaeb0dc038bb91e.tar ikiwiki-85e97bd9753676f261449a1dbbaeb0dc038bb91e.tar.gz | |
I am bad at formatting.
Diffstat (limited to 'doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn')
| -rw-r--r-- | doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn b/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn index 421315b93..ac75c441a 100644 --- a/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn +++ b/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn @@ -4,21 +4,21 @@ A subsequent commit (including another web page edit with comments) will pull th IkiWiki/plugin/git.pm checks for a version of git greater than 1.5.4, and if greater, commits with a blank message and '--cleanup=verbatim'. The cleanup option doesn't let the message get committed. Relatively new versions of git support '--allow-empty-message' but I haven't been able to identify when that feature was added. Instead I opted for a default message. -544,545d543 -< # git will not commit with a blank comment, though this -< # can be overridden in later versions. -547c545,553 -< $params{message}.="No commit message specified."; ---- -> # Force git to allow empty commit messages. -> # (If this version of git supports it.) -> my ($version)=`git --version` =~ /git version (.*)/; -> if ($version ge "1.5.4") { -> push @opts, '--cleanup=verbatim'; -> } -> else { -> $params{message}.="."; -> } + 544,545d543 + < # git will not commit with a blank comment, though this + < # can be overridden in later versions. + 547c545,553 + < $params{message}.="No commit message specified."; + --- + > # Force git to allow empty commit messages. + > # (If this version of git supports it.) + > my ($version)=`git --version` =~ /git version (.*)/; + > if ($version ge "1.5.4") { + > push @opts, '--cleanup=verbatim'; + > } + > else { + > $params{message}.="."; + > } The other option would be to change only line 549: |