diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2018-08-20 18:24:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-21 10:22:51 -0700 |
| commit | d6538246d3d4edbfbc9b0af6a2aa38552d35f7f1 (patch) | |
| tree | 9a21c3365c28466618eec17ef374aa77d6074c99 /builtin | |
| parent | b7758963424e238b9152f0c9991325ff7fdffff1 (diff) | |
| download | git-d6538246d3d4edbfbc9b0af6a2aa38552d35f7f1.tar.gz | |
commit-graph: not compatible with replace objects
Create new method commit_graph_compatible(r) to check if a given
repository r is compatible with the commit-graph feature. Fill the
method with a check to see if replace-objects exist. Test this
interaction succeeds, including ignoring an existing commit-graph and
failing to write a new commit-graph. However, we do ensure that
we write a new commit-graph by setting read_replace_refs to 0, thereby
ignoring the replace refs.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit-graph.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 0bf0c48657..da737df321 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -120,6 +120,8 @@ static int graph_read(int argc, const char **argv) return 0; } +extern int read_replace_refs; + static int graph_write(int argc, const char **argv) { struct string_list *pack_indexes = NULL; @@ -150,6 +152,8 @@ static int graph_write(int argc, const char **argv) if (!opts.obj_dir) opts.obj_dir = get_object_directory(); + read_replace_refs = 0; + if (opts.reachable) { write_commit_graph_reachable(opts.obj_dir, opts.append); return 0; |