Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> --- Hi Johannes, If you need to re-roll your 'js/difftool-builtin' branch, could you please squash this into the relevant patch. Thanks! Also, due to a problem in my config.mak file on Linux (a commented out line that had a line continuation '\', grrrrr!), gcc issued a warning, thus: builtin/difftool.c: In function ‘run_dir_diff’: builtin/difftool.c:568:13: warning: zero-length gnu_printf format string [-Wformat-zero-length] warning(""); ^ I am not sure why -Wno-format-zero-length is set in DEVELOPER_CFLAGS, but do you really need to space the output with an an 'empty' "warning:" line? (Just curious). ATB, Ramsay Jones builtin/difftool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index 3480920..830369c 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -170,7 +170,7 @@ struct path_entry { char path[FLEX_ARRAY]; }; -int path_entry_cmp(struct path_entry *a, struct path_entry *b, void *key) +static int path_entry_cmp(struct path_entry *a, struct path_entry *b, void *key) { return strcmp(a->path, key ? key : b->path); } -- 2.9.0