parse-options: option to let --git-completion-helper show negative form

diff --git a/commit.h b/commit.h
index dc4bf97d9f3b74da1176d552f067e00b72a2d7fb..10e34e1a18b726b0168a9fe2e4937a23d6cefd11 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -22,6 +22,12 @@ struct commit {
        unsigned int index;
        timestamp_t date;
        struct commit_list *parents;
+
+       /*
+        * If the commit is loaded from the commit-graph file, then this
+        * member may be NULL. Only access it through get_commit_tree()
+        * or get_commit_tree_oid().
+        */
        struct tree *maybe_tree;
        uint32_t graph_pos;
 };
@@ -297,10 +303,10 @@ extern const char *find_commit_header(const char *msg, const char *key,
 /* Find the end of the log message, the right place for a new trailer. */
 extern int ignore_non_trailer(const char *buf, size_t len);
 
-typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
+typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
                                 void *cb_data);
 
-extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
+extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
 
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */