Merge branch 'maint'

diff --git a/builtin-add.c b/builtin-add.c
index 56e522127c3e73fad59d8dc96bdffdb87a3b7a44..4e44148e05843e03befc167f6bdf3a1567d3f8ad 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -189,7 +189,7 @@ int interactive_add(int argc, const char **argv, const char *prefix)
        return status;
 }
 
-int edit_patch(int argc, const char **argv, const char *prefix)
+static int edit_patch(int argc, const char **argv, const char *prefix)
 {
        char *file = xstrdup(git_path("ADD_EDIT.patch"));
        const char *apply_argv[] = { "apply", "--recount", "--cached",