Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / notes-utils.c

diff --git a/notes-utils.c b/notes-utils.c
index 4a793eb347f74bf031b69d9315d2c678793e4935..97c031c26ec7c7c2fdade8478fa039d470820bad 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -94,7 +94,9 @@ static combine_notes_fn parse_combine_notes_fn(const char *v)
                return NULL;
 }
 
-static int notes_rewrite_config(const char *k, const char *v, void *cb)
+static int notes_rewrite_config(const char *k, const char *v,
+                               const struct config_context *ctx UNUSED,
+                               void *cb)
 {
        struct notes_rewrite_cfg *c = cb;
        if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) {