Merge commit 'upstream/master' into pub/master

[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 aac3c6307bfe1951221de4a32e9a050f421a2711..9c8b340de9882ac732a2926a5c305086dcdf1a8f 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/
 
@@ -18,4 +18,9 @@ diffurls of the following form:
                        $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
                        $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
                        $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
-     
+
+> [[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]]