sequencer: ensure to release the lock when we could not read the index

diff --git a/commit.h b/commit.h
index 23ae0c1d642c1b83ed0af383625e48bce710b10b..32e1a113e589f10ab3080dc173295083cd0c84ca 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -362,9 +362,11 @@ extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *
 
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */
-       const char *name;
+       char name[FLEX_ARRAY];
 };
 #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
+extern void set_merge_remote_desc(struct commit *commit,
+                                 const char *name, struct object *obj);
 
 /*
  * Given "name" from the command line to merge, find the commit object