diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-06-14 08:50:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-14 19:26:33 +0200 |
| commit | 8a676bdc5c3a9377322834326605b3804c7c54bf (patch) | |
| tree | 551c16fa99f69bb3d1933876cc95b842cb64d8af /reset.h | |
| parent | refs: avoid include cycle with "repository.h" (diff) | |
| download | git-8a676bdc5c3a9377322834326605b3804c7c54bf.tar.xz git-8a676bdc5c3a9377322834326605b3804c7c54bf.zip | |
hash-ll: merge with "hash.h"
The "hash-ll.h" header was introduced via d1cbe1e6d8 (hash-ll.h: split
out of hash.h to remove dependency on repository.h, 2023-04-22) to make
explicit the split between hash-related functions that rely on the
global `the_repository`, and those that don't. This split is no longer
necessary now that we we have removed the reliance on `the_repository`.
Merge "hash-ll.h" back into "hash.h". This causes some code units to not
include "repository.h" anymore, which requires us to add some forward
declarations.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'reset.h')
| -rw-r--r-- | reset.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ #ifndef RESET_H #define RESET_H -#include "hash-ll.h" +#include "hash.h" #include "repository.h" #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION" |