mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ds/commit-graph-on-fetch'

Browse Source 
Regression fix.

* ds/commit-graph-on-fetch:
  commit-graph: fix writing first commit-graph during fetch
  t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
This commit is contained in:
Junio C Hamano
2019-11-04 13:33:06 +09:00
parent c32ca691c2 cb99a34e23
commit dac1d83c91
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
commit-graph.c
View File

@ -41,6 +41,9 @@
#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \ #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
+ GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) + 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 *get_commit_graph_filename(const char *obj_dir)
{ {
char *filename = xstrfmt("%s/info/commit-graph", obj_dir); char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
@ -1030,11 +1033,11 @@ static void add_missing_parents(struct write_commit_graph_context *ctx, struct c
{ {
struct commit_list *parent; struct commit_list *parent;
for (parent = commit->parents; parent; parent = parent->next) { 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); ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid)); oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid));
ctx->oids.nr++; ctx->oids.nr++;
parent->item->object.flags |= UNINTERESTING; parent->item->object.flags |= REACHABLE;
} }
} }
} }
@ -1052,7 +1055,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
display_progress(ctx->progress, i + 1); display_progress(ctx->progress, i + 1);
commit = lookup_commit(ctx->r, &ctx->oids.list[i]); commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
if (commit) if (commit)
commit->object.flags |= UNINTERESTING; commit->object.flags |= REACHABLE;
} }
stop_progress(&ctx->progress); stop_progress(&ctx->progress);
@ -1089,7 +1092,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
commit = lookup_commit(ctx->r, &ctx->oids.list[i]); commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
if (commit) if (commit)
commit->object.flags &= ~UNINTERESTING; commit->object.flags &= ~REACHABLE;
} }
stop_progress(&ctx->progress); stop_progress(&ctx->progress);
} }

1
commit-reach.c
View File

@ -10,7 +10,6 @@
#include "commit-reach.h" #include "commit-reach.h"
/* Remember to update object flag allocation in object.h */ /* Remember to update object flag allocation in object.h */
#define REACHABLE (1u<<15)
#define PARENT1 (1u<<16) #define PARENT1 (1u<<16)
#define PARENT2 (1u<<17) #define PARENT2 (1u<<17)
#define STALE (1u<<18) #define STALE (1u<<18)

3
object.h
View File

@ -68,7 +68,8 @@ struct object_array {
* bisect.c: 16 * bisect.c: 16
* bundle.c: 16 * bundle.c: 16
* http-push.c: 16-----19 * http-push.c: 16-----19
* commit-reach.c: 15-------19 * commit-graph.c: 15
* commit-reach.c: 16-----19
* sha1-name.c: 20 * sha1-name.c: 20
* list-objects-filter.c: 21 * list-objects-filter.c: 21
* builtin/fsck.c: 0--3 * builtin/fsck.c: 0--3

16
t/t5510-fetch.sh
View File

@ -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 # configured prune tests
set_config_tristate () { set_config_tristate () {