Merge branch 'jz/patch-id'
A new "--include-whitespace" option is added to "git patch-id", and existing bugs in the internal patch-id logic that did not match what "git patch-id" produces have been corrected. * jz/patch-id: builtin: patch-id: remove unused diff-tree prefix builtin: patch-id: add --verbatim as a command mode patch-id: fix patch-id for mode changes builtin: patch-id: fix patch-id with binary diffs patch-id: use stable patch-id for rebases patch-id: fix stable patch id for binary / header-only
This commit is contained in:
10
patch-ids.c
10
patch-ids.c
@ -11,7 +11,7 @@ static int patch_id_defined(struct commit *commit)
|
||||
}
|
||||
|
||||
int commit_patch_id(struct commit *commit, struct diff_options *options,
|
||||
struct object_id *oid, int diff_header_only, int stable)
|
||||
struct object_id *oid, int diff_header_only)
|
||||
{
|
||||
if (!patch_id_defined(commit))
|
||||
return -1;
|
||||
@ -22,7 +22,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
|
||||
else
|
||||
diff_root_tree_oid(&commit->object.oid, "", options);
|
||||
diffcore_std(options);
|
||||
return diff_flush_patch_id(options, oid, diff_header_only, stable);
|
||||
return diff_flush_patch_id(options, oid, diff_header_only);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -48,11 +48,11 @@ static int patch_id_neq(const void *cmpfn_data,
|
||||
b = container_of(entry_or_key, struct patch_id, ent);
|
||||
|
||||
if (is_null_oid(&a->patch_id) &&
|
||||
commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
|
||||
commit_patch_id(a->commit, opt, &a->patch_id, 0))
|
||||
return error("Could not get patch ID for %s",
|
||||
oid_to_hex(&a->commit->object.oid));
|
||||
if (is_null_oid(&b->patch_id) &&
|
||||
commit_patch_id(b->commit, opt, &b->patch_id, 0, 0))
|
||||
commit_patch_id(b->commit, opt, &b->patch_id, 0))
|
||||
return error("Could not get patch ID for %s",
|
||||
oid_to_hex(&b->commit->object.oid));
|
||||
return !oideq(&a->patch_id, &b->patch_id);
|
||||
@ -82,7 +82,7 @@ static int init_patch_id_entry(struct patch_id *patch,
|
||||
struct object_id header_only_patch_id;
|
||||
|
||||
patch->commit = commit;
|
||||
if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
|
||||
if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
|
||||
return -1;
|
||||
|
||||
hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id));
|
||||
|
Reference in New Issue
Block a user