Merge branch 'np/maint-huge-delta-generation' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index 9b88ce9256279728028c2648703ee150ee8a9e0e..28e3be2eadadc71723da96334b8ff1dd22e73205 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -91,10 +91,10 @@ struct origin {
  * if the textconv driver exists.
  * Return 1 if the conversion succeeds, 0 otherwise.
  */
-static int textconv_object(const char *path,
-                          const unsigned char *sha1,
-                          char **buf,
-                          unsigned long *buf_size)
+int textconv_object(const char *path,
+                   const unsigned char *sha1,
+                   char **buf,
+                   unsigned long *buf_size)
 {
        struct diff_filespec *df;
        struct userdiff_driver *textconv;
@@ -2376,11 +2376,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
         *
         * The remaining are:
         *
-        * (1) if dashdash_pos != 0, its either
+        * (1) if dashdash_pos != 0, it is either
         *     "blame [revisions] -- <path>" or
         *     "blame -- <path> <rev>"
         *
-        * (2) otherwise, its one of the two:
+        * (2) otherwise, it is one of the two:
         *     "blame [revisions] <path>"
         *     "blame <path> <rev>"
         *