undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-diff: convert diff_root_tree_sha1 to struct object_id

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-05-30 10:30:57 -07:00 committed by Junio C Hamano
parent 09fae19aa8
commit 7b8dea0c75
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fast-export.c
View File

@ -566,8 +566,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
commit->tree->object.oid.hash, "", &rev->diffopt); commit->tree->object.oid.hash, "", &rev->diffopt);
} }
else else
diff_root_tree_sha1(commit->tree->object.oid.hash, diff_root_tree_oid(&commit->tree->object.oid,
"", &rev->diffopt); "", &rev->diffopt);
/* Export the referenced blobs, and remember the marks. */ /* Export the referenced blobs, and remember the marks. */
for (i = 0; i < diff_queued_diff.nr; i++) for (i = 0; i < diff_queued_diff.nr; i++)

4
diff.h
View File

@ -215,8 +215,8 @@ extern struct combine_diff_path *diff_tree_paths(
struct strbuf *base, struct diff_options *opt); struct strbuf *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
const char *base, struct diff_options *opt); const char *base, struct diff_options *opt);
extern int diff_root_tree_sha1(const unsigned char *new, const char *base, extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
struct diff_options *opt); struct diff_options *opt);
struct combine_diff_path { struct combine_diff_path {
struct combine_diff_path *next; struct combine_diff_path *next;

2
log-tree.c
View File

@ -803,7 +803,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
parents = get_saved_parents(opt, commit); parents = get_saved_parents(opt, commit);
if (!parents) { if (!parents) {
if (opt->show_root_diff) { if (opt->show_root_diff) {
diff_root_tree_sha1(oid->hash, "", &opt->diffopt); diff_root_tree_oid(oid, "", &opt->diffopt);
log_tree_diff_flush(opt); log_tree_diff_flush(opt);
} }
return !opt->loginfo; return !opt->loginfo;

2
patch-ids.c
View File

@ -20,7 +20,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
diff_tree_sha1(commit->parents->item->object.oid.hash, diff_tree_sha1(commit->parents->item->object.oid.hash,
commit->object.oid.hash, "", options); commit->object.oid.hash, "", options);
else else
diff_root_tree_sha1(commit->object.oid.hash, "", options); diff_root_tree_oid(&commit->object.oid, "", options);
diffcore_std(options); diffcore_std(options);
return diff_flush_patch_id(options, oid, diff_header_only); return diff_flush_patch_id(options, oid, diff_header_only);
} }

4
tree-diff.c
View File

@ -711,7 +711,7 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
return retval; return retval;
} }
int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt) int diff_root_tree_oid(const struct object_id *new_oid, const char *base, struct diff_options *opt)
{ {
return diff_tree_sha1(NULL, new, base, opt); return diff_tree_sha1(NULL, new_oid->hash, base, opt);
} }