Try normalizing files to avoid delete/modify conflicts when merging

diff --git a/builtin/notes.c b/builtin/notes.c
index ba8fd178c8d188095e944c6a030d807d2b9f8312..f1f53a80e188327c0da21b046f0e8879caabc6af 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -313,7 +313,7 @@ int commit_notes(struct notes_tree *t, const char *msg)
        return 0;
 }
 
-combine_notes_fn *parse_combine_notes_fn(const char *v)
+combine_notes_fn parse_combine_notes_fn(const char *v)
 {
        if (!strcasecmp(v, "overwrite"))
                return combine_notes_overwrite;
@@ -416,7 +416,7 @@ int notes_copy_from_stdin(int force, const char *rewrite_cmd)
 {
        struct strbuf buf = STRBUF_INIT;
        struct notes_rewrite_cfg *c = NULL;
-       struct notes_tree *t;
+       struct notes_tree *t = NULL;
        int ret = 0;
 
        if (rewrite_cmd) {