kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sp/tree-diff-wo-the-repository' 

The last uses of the_repository in "tree-diff.c" have been
eradicated.

* sp/tree-diff-wo-the-repository:
  tree-diff: remove the usage of the_hash_algo global
maint
Junio C Hamano 2026-03-04 10:53:00 -08:00
parent 7b7d67104e 1e50d839f8
commit 8f760e7e8b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tree-diff.c
View File

@ -2,7 +2,6 @@
* Helper functions for tree diff generation
*/

#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS

#include "git-compat-util.h"
@ -11,7 +10,6 @@
#include "hash.h"
#include "tree.h"
#include "tree-walk.h"
#include "environment.h"
#include "repository.h"
#include "dir.h"

@ -253,7 +251,7 @@ static void emit_path(struct combine_diff_path ***tail,

strbuf_add(base, path, pathlen);
p = combine_diff_path_new(base->buf, base->len, mode,
oid ? oid : null_oid(the_hash_algo),
oid ? oid : null_oid(opt->repo->hash_algo),
nparent);
strbuf_setlen(base, old_baselen);

@ -278,7 +276,7 @@ static void emit_path(struct combine_diff_path ***tail,
mode_i = tp[i].entry.mode;
}
else {
oid_i = null_oid(the_hash_algo);
oid_i = null_oid(opt->repo->hash_algo);
mode_i = 0;
}