diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-10 23:22:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-10 23:22:30 +0200 |
| commit | 3eb4cc451ed97123ff76e183a5be8a7dc164d1f6 (patch) | |
| tree | e461fea00a0f4780a41b9baa13de7fd056f644f2 /diff.h | |
| parent | Merge branch 'ps/leakfixes-part-8' (diff) | |
| parent | diff: store graph prefix buf in git_graph struct (diff) | |
| download | git-3eb4cc451ed97123ff76e183a5be8a7dc164d1f6.tar.xz git-3eb4cc451ed97123ff76e183a5be8a7dc164d1f6.zip | |
Merge branch 'jk/output-prefix-cleanup'
Code clean-up.
* jk/output-prefix-cleanup:
diff: store graph prefix buf in git_graph struct
diff: return line_prefix directly when possible
diff: return const char from output_prefix callback
diff: drop line_prefix_length field
line-log: use diff_line_prefix() instead of custom helper
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -94,7 +94,7 @@ typedef void (*add_remove_fn_t)(struct diff_options *options, typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, struct diff_options *options, void *data); -typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); +typedef const char *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); #define DIFF_FORMAT_RAW 0x0001 #define DIFF_FORMAT_DIFFSTAT 0x0002 @@ -274,7 +274,6 @@ struct diff_options { const char *single_follow; const char *a_prefix, *b_prefix; const char *line_prefix; - size_t line_prefix_length; /** * collection of boolean options that affects the operation, but some do |