Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2011-04-30 16:31:36 -04:00
commit 5885551e82
1 changed files with 3 additions and 0 deletions

View File

@ -11,6 +11,9 @@ I've fixed this initial construction case, and, based on my testing, I've also f
Please commit so my users stop whining at me about having clean branches to push to, the big babies. Please commit so my users stop whining at me about having clean branches to push to, the big babies.
Summary: Change three scary loud failure cases related to empty branches into three scary loud success cases. Summary: Change three scary loud failure cases related to empty branches into three scary loud success cases.
[[!tag patch]]
<pre> <pre>
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cf7fbe9..5b1e334 100644 index cf7fbe9..5b1e334 100644