summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-02-07 20:15:26 +0000
committerJunio C Hamano <gitster@pobox.com>2013-02-12 11:42:07 -0800
commitf192223447746a503bf664135a0e537d15876ebe (patch)
treeb8dc638c95c4e2b289f899cbad1d7e1a0323dd26
parent32b367e4441f8566f200459149d1aaee8fafc867 (diff)
downloadgit-f192223447746a503bf664135a0e537d15876ebe.tar.gz
diff: add diff_line_prefix function
This is a helper function to call the diff output_prefix function and return its value as a C string, allowing us to greatly simplify everywhere that needs to get the output prefix. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c10
-rw-r--r--diff.h3
2 files changed, 13 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index e00fc90538..b768b7d384 100644
--- a/diff.c
+++ b/diff.c
@@ -1105,6 +1105,16 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)
return "";
}
+const char *diff_line_prefix(struct diff_options *opt)
+{
+ struct strbuf *msgbuf;
+ if (!opt->output_prefix)
+ return "";
+
+ msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
+ return msgbuf->buf;
+}
+
static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
{
const char *cp;
diff --git a/diff.h b/diff.h
index a47bae48d5..76830e28b4 100644
--- a/diff.h
+++ b/diff.h
@@ -174,6 +174,9 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix);
diff_get_color((o)->use_color, ix)
+const char *diff_line_prefix(struct diff_options *);
+
+
extern const char mime_boundary_leader[];
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);