diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-07-02 18:59:00 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-07-02 18:59:00 +0200 |
commit | 7b472da91541d672ee220896a3a7fd4508c378f3 (patch) | |
tree | 2687a29530b4a8b50c7f99a394cc5b69f06d7adb /add-patch.c | |
parent | Merge branch 'ew/cat-file-unbuffered-tests' (diff) | |
parent | hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE` (diff) | |
download | git-7b472da91541d672ee220896a3a7fd4508c378f3.tar.xz git-7b472da91541d672ee220896a3a7fd4508c378f3.zip |
Merge branch 'ps/use-the-repository'
A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help
transition the codebase to rely less on the availability of the
singleton the_repository instance.
* ps/use-the-repository:
hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE`
t/helper: remove dependency on `the_repository` in "proc-receive"
t/helper: fix segfault in "oid-array" command without repository
t/helper: use correct object hash in partial-clone helper
compat/fsmonitor: fix socket path in networked SHA256 repos
replace-object: use hash algorithm from passed-in repository
protocol-caps: use hash algorithm from passed-in repository
oidset: pass hash algorithm when parsing file
http-fetch: don't crash when parsing packfile without a repo
hash-ll: merge with "hash.h"
refs: avoid include cycle with "repository.h"
global: introduce `USE_THE_REPOSITORY_VARIABLE` macro
hash: require hash algorithm in `empty_tree_oid_hex()`
hash: require hash algorithm in `is_empty_{blob,tree}_oid()`
hash: make `is_null_oid()` independent of `the_repository`
hash: convert `oidcmp()` and `oideq()` to compare whole hash
global: ensure that object IDs are always padded
hash: require hash algorithm in `oidread()` and `oidclr()`
hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()`
hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions
Diffstat (limited to 'add-patch.c')
-rw-r--r-- | add-patch.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/add-patch.c b/add-patch.c index d8ea05ff10..6e176cd21a 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "add-interactive.h" #include "advice.h" @@ -421,7 +423,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) /* could be on an unborn branch */ !strcmp("HEAD", s->revision) && repo_get_oid(the_repository, "HEAD", &oid) ? - empty_tree_oid_hex() : s->revision); + empty_tree_oid_hex(the_repository->hash_algo) : s->revision); } color_arg_index = args.nr; /* Use `--no-color` explicitly, just in case `diff.color = always`. */ |