Thread (13 messages) flat view 13 messages, 4 authors, 2018-06-09

Re: [RFC PATCH 4/6] commit-graph: avoid writing when repo is shallow

From: Stefan Beller <hidden>
Date: 2018-05-31 19:07:45

On Thu, May 31, 2018 at 10:41 AM, Derrick Stolee [off-list ref] wrote:
Shallow clones do not interact well with the commit-graph feature for
several reasons. Instead of doing the hard thing to fix those
interactions, instead prevent reading or writing a commit-graph file for
shallow repositories.
Makes sense.
quoted hunk ↗ jump to hunk
Signed-off-by: Derrick Stolee <redacted>
---
 commit-graph.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
diff --git a/commit-graph.c b/commit-graph.c
index 95af4ed519..80e377b90f 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -208,6 +208,9 @@ static void prepare_commit_graph(void)
                return;
        prepare_commit_graph_run_once = 1;

+       if (is_repository_shallow())
+               return;
+
        obj_dir = get_object_directory();
        prepare_commit_graph_one(obj_dir);
        prepare_alt_odb();
@@ -711,6 +714,15 @@ void write_commit_graph(const char *obj_dir,
        int num_extra_edges;
        struct commit_list *parent;

+       /*
+        * Shallow clones are not supproted, as they create bad
supported
+        * generation skips as they are un-shallowed.
+        */
+       if (is_repository_shallow()) {
+               warning("writing a commit-graph in a shallow repository is not supported");
_() ?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help