Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / provide_sha1_for_git_diffurl.mdwn

diff --git a/doc/todo/provide_sha1_for_git_diffurl.mdwn b/doc/todo/provide_sha1_for_git_diffurl.mdwn
index dfd848058f55fdf1329a4d8f8b4b96e44a8171a7..01aa512f8d5565a343df5e7818a9efda8a825b5f 100644 (file)
--- a/doc/todo/provide_sha1_for_git_diffurl.mdwn
+++ b/doc/todo/provide_sha1_for_git_diffurl.mdwn
@@ -2,7 +2,7 @@ This [[patch]] allows for `\[[sha1]]` substitution in the `diffurl`
 for git repositories.  This is useful for use with [cgit][] which has
 diffurls of the following form:
 
-    /project.git/diff/\[[file]]?id=\[[sha1]]
+    /project.git/diff/\[[file]]?id=\[[sha1_commit]]
 
  [cgit]: http://hjemli.net/git/cgit/
 
@@ -10,7 +10,7 @@ diffurls of the following form:
     index 5bef928..164210d 100644
     --- a/IkiWiki/Plugin/git.pm
     +++ b/IkiWiki/Plugin/git.pm
-    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) { #{{{
+    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) {
      
                        my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
                        $diffurl =~ s/\[\[file\]\]/$file/go;
@@ -21,3 +21,6 @@ diffurls of the following form:
 
 > [[done]], but I called it `sha1_commit` since I think that's what it's
 > actually a sha1 of. --[[Joey]]
+
+>> I was at a loss for something more descriptive...I like that much
+>> better :) Thanks! --[[JasonBlevins]]