Skip to content

Commit

Permalink
Merge pull request #2383 from derrickstolee/fetch-first-write-fail
Browse files Browse the repository at this point in the history
Fix `fetch.writeCommitGraph` failure first fetch
  • Loading branch information
dscho committed Nov 2, 2019
2 parents 9356bff + 6d01e90 commit 44c1590
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
11 changes: 7 additions & 4 deletions commit-graph.c
Expand Up @@ -41,6 +41,9 @@
#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
+ GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)

/* Remember to update object flag allocation in object.h */
#define REACHABLE (1u<<15)

char *get_commit_graph_filename(const char *obj_dir)
{
char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
Expand Down Expand Up @@ -1030,11 +1033,11 @@ static void add_missing_parents(struct write_commit_graph_context *ctx, struct c
{
struct commit_list *parent;
for (parent = commit->parents; parent; parent = parent->next) {
if (!(parent->item->object.flags & UNINTERESTING)) {
if (!(parent->item->object.flags & REACHABLE)) {
ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid));
ctx->oids.nr++;
parent->item->object.flags |= UNINTERESTING;
parent->item->object.flags |= REACHABLE;
}
}
}
Expand All @@ -1052,7 +1055,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
display_progress(ctx->progress, i + 1);
commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
if (commit)
commit->object.flags |= UNINTERESTING;
commit->object.flags |= REACHABLE;
}
stop_progress(&ctx->progress);

Expand Down Expand Up @@ -1089,7 +1092,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
commit = lookup_commit(ctx->r, &ctx->oids.list[i]);

if (commit)
commit->object.flags &= ~UNINTERESTING;
commit->object.flags &= ~REACHABLE;
}
stop_progress(&ctx->progress);
}
Expand Down
1 change: 0 additions & 1 deletion commit-reach.c
Expand Up @@ -10,7 +10,6 @@
#include "commit-reach.h"

/* Remember to update object flag allocation in object.h */
#define REACHABLE (1u<<15)
#define PARENT1 (1u<<16)
#define PARENT2 (1u<<17)
#define STALE (1u<<18)
Expand Down
3 changes: 2 additions & 1 deletion object.h
Expand Up @@ -68,7 +68,8 @@ struct object_array {
* bisect.c: 16
* bundle.c: 16
* http-push.c: 16-----19
* commit-reach.c: 15-------19
* commit-graph.c: 15
* commit-reach.c: 16-----19
* sha1-name.c: 20
* list-objects-filter.c: 21
* builtin/fsck.c: 0--3
Expand Down
16 changes: 16 additions & 0 deletions t/t5510-fetch.sh
Expand Up @@ -583,6 +583,22 @@ test_expect_success 'fetch.writeCommitGraph' '
)
'

test_expect_success 'fetch.writeCommitGraph with submodules' '
git clone dups super &&
(
cd super &&
git submodule add "file://$TRASH_DIRECTORY/three" &&
git commit -m "add submodule"
) &&
git clone "super" super-clone &&
(
cd super-clone &&
rm -rf .git/objects/info &&
git -c fetch.writeCommitGraph=true fetch origin &&
test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
)
'

# configured prune tests

set_config_tristate () {
Expand Down

0 comments on commit 44c1590

Please sign in to comment.