blank_boundary = git_config_bool(var, value);
return 0;
}
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
}
+ /*
+ * Prepare a dummy commit that represents the work tree (or staged) item.
+ * Note that annotating work tree item never works in the reverse.
+ */
static struct commit *fake_working_tree_commit(const char *path, const char *contents_from)
{
struct commit *commit;
if (revs->reverse && revs->reflog_info)
die("cannot combine --reverse with --walk-reflogs");
- if (revs->parents && revs->children.name)
++ if (revs->rewrite_parents && revs->children.name)
+ die("cannot combine --parents and --children");
+
+ /*
+ * Limitations on the graph functionality
+ */
+ if (revs->reverse && revs->graph)
+ die("cannot combine --reverse with --graph");
+
+ if (revs->reflog_info && revs->graph)
+ die("cannot combine --walk-reflogs with --graph");
+
return left;
}
commit->buffer, strlen(commit->buffer));
}
- return (revs->parents || revs->children.name);
+ static inline int want_ancestry(struct rev_info *revs)
+ {
++ return (revs->rewrite_parents || revs->children.name);
+ }
+
enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
{
if (commit->object.flags & SHOWN)