summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@gmail.com>2017-05-24 05:15:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-24 06:41:50 (GMT)
commit3a35cb2ea8ab5d44d6ea6290b7af8a7c8623e4c2 (patch)
tree0fd1226cd250882b3d38203e7509a880f129fdf4 /builtin/blame.c
parentb84bc9c3677c9746bfd81a64ed30b0670c8ff0f9 (diff)
downloadgit-3a35cb2ea8ab5d44d6ea6290b7af8a7c8623e4c2.zip
git-3a35cb2ea8ab5d44d6ea6290b7af8a7c8623e4c2.tar.gz
git-3a35cb2ea8ab5d44d6ea6290b7af8a7c8623e4c2.tar.bz2
blame: move textconv_object with related functions
textconv_object is used in places other than blame.c and should be moved to a more appropriate location. Other textconv related functions are located in diff.c so that seems as good a place as any. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index d39f6af..fbd757e 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -147,34 +147,6 @@ static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b,
}
/*
- * Prepare diff_filespec and convert it using diff textconv API
- * if the textconv driver exists.
- * Return 1 if the conversion succeeds, 0 otherwise.
- */
-int textconv_object(const char *path,
- unsigned mode,
- const struct object_id *oid,
- int oid_valid,
- char **buf,
- unsigned long *buf_size)
-{
- struct diff_filespec *df;
- struct userdiff_driver *textconv;
-
- df = alloc_filespec(path);
- fill_filespec(df, oid->hash, oid_valid, mode);
- textconv = get_textconv(df);
- if (!textconv) {
- free_filespec(df);
- return 0;
- }
-
- *buf_size = fill_textconv(textconv, df, buf);
- free_filespec(df);
- return 1;
-}
-
-/*
* Given an origin, prepare mmfile_t structure to be used by the
* diff machinery
*/