patch-id: use stable patch-id for rebases
Git doesn't persist patch-ids during the rebase process, so there is no need to specifically invoke the unstable variant. Use the stable logic for all internal patch-id calculations to minimize the number of code paths and improve test coverage. Signed-off-by: Jerry Zhang <jerry@skydio.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jerry Zhang committed
Oct 24, 2022 at 20:07 UTC
51276c1832d64d3b8f4dfc06c3ef21bf74f1916e
5 files changed
+12
-16
builtin/log.c
+1
-1
@@ -1694,7 +1694,7 @@ static void prepare_bases(struct base_tree_info *bases,
1694
struct object_id *patch_id;
1695
if (*commit_base_at(&commit_base, commit))
1696
continue;
1697
- if (commit_patch_id(commit, &diffopt, &oid, 0, 1))
1697
+ if (commit_patch_id(commit, &diffopt, &oid, 0))
1698
die(_("cannot get patch id"));
1699
ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
1700
patch_id = bases->patch_id + bases->nr_patch_id;
diff.c
+4
-8
@@ -6174,7 +6174,7 @@ static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode)
6174
}
6175
6176
/* returns 0 upon success, and writes result into oid */
6177
-static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6177
+static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
6178
{
6179
struct diff_queue_struct *q = &diff_queued_diff;
6180
int i;
@@ -6261,21 +6261,17 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
6261
return error("unable to generate patch-id diff for %s",
6262
p->one->path);
6263
}
6264
- if (stable)
6265
- flush_one_hunk(oid, &ctx);
6264
+ flush_one_hunk(oid, &ctx);
6265
}
6266
6268
- if (!stable)
6269
- the_hash_algo->final_oid_fn(oid, &ctx);
6270
-
6267
return 0;
6268
}
6269
6274
-int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6270
+int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
6271
{
6272
struct diff_queue_struct *q = &diff_queued_diff;
6273
int i;
6278
- int result = diff_get_patch_id(options, oid, diff_header_only, stable);
6274
+ int result = diff_get_patch_id(options, oid, diff_header_only);
6275
6276
for (i = 0; i < q->nr; i++)
6277
diff_free_filepair(q->queue[i]);
diff.h
+1
-1
@@ -634,7 +634,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option);
634
int run_diff_index(struct rev_info *revs, unsigned int option);
635
636
int do_diff_cache(const struct object_id *, struct diff_options *);
637
-int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
637
+int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
638
void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
639
640
int diff_result_code(struct diff_options *, int);
patch-ids.c
+5
-5
@@ -11,7 +11,7 @@ static int patch_id_defined(struct commit *commit)
11
}
12
13
int commit_patch_id(struct commit *commit, struct diff_options *options,
14
- struct object_id *oid, int diff_header_only, int stable)
14
+ struct object_id *oid, int diff_header_only)
15
{
16
if (!patch_id_defined(commit))
17
return -1;
@@ -22,7 +22,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
22
else
23
diff_root_tree_oid(&commit->object.oid, "", options);
24
diffcore_std(options);
25
- return diff_flush_patch_id(options, oid, diff_header_only, stable);
25
+ return diff_flush_patch_id(options, oid, diff_header_only);
26
}
27
28
/*
@@ -48,11 +48,11 @@ static int patch_id_neq(const void *cmpfn_data,
48
b = container_of(entry_or_key, struct patch_id, ent);
49
50
if (is_null_oid(&a->patch_id) &&
51
- commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
51
+ commit_patch_id(a->commit, opt, &a->patch_id, 0))
52
return error("Could not get patch ID for %s",
53
oid_to_hex(&a->commit->object.oid));
54
if (is_null_oid(&b->patch_id) &&
55
- commit_patch_id(b->commit, opt, &b->patch_id, 0, 0))
55
+ commit_patch_id(b->commit, opt, &b->patch_id, 0))
56
return error("Could not get patch ID for %s",
57
oid_to_hex(&b->commit->object.oid));
58
return !oideq(&a->patch_id, &b->patch_id);
@@ -82,7 +82,7 @@ static int init_patch_id_entry(struct patch_id *patch,
82
struct object_id header_only_patch_id;
83
84
patch->commit = commit;
85
- if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
85
+ if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
86
return -1;
87
88
hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id));
patch-ids.h
+1
-1
@@ -20,7 +20,7 @@ struct patch_ids {
20
};
21
22
int commit_patch_id(struct commit *commit, struct diff_options *options,
23
- struct object_id *oid, int, int);
23
+ struct object_id *oid, int);
24
int init_patch_ids(struct repository *, struct patch_ids *);
25
int free_patch_ids(struct patch_ids *);
26