diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2018-04-02 22:34:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-02 23:27:30 +0200 |
| commit | cfe83216e404223ce8c5f6ef79c4ba9a27ff872e (patch) | |
| tree | 6f64a9ccff4777e87bd43fdf8e051a215048ae63 /csum-file.h | |
| parent | csum-file: rename hashclose() to finalize_hashfile() (diff) | |
| download | git-cfe83216e404223ce8c5f6ef79c4ba9a27ff872e.tar.xz git-cfe83216e404223ce8c5f6ef79c4ba9a27ff872e.zip | |
csum-file: refactor finalize_hashfile() method
If we want to use a hashfile on the temporary file for a lockfile, then
we need finalize_hashfile() to fully write the trailing hash but also keep
the file descriptor open.
Do this by adding a new CSUM_HASH_IN_STREAM flag along with a functional
change that checks this flag before writing the checksum to the stream.
This differs from previous behavior since it would be written if either
CSUM_CLOSE or CSUM_FSYNC is provided.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.h')
| -rw-r--r-- | csum-file.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/csum-file.h b/csum-file.h index 9ba87f0a6c..c5a2e335e7 100644 --- a/csum-file.h +++ b/csum-file.h @@ -27,8 +27,9 @@ extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *) extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *); /* finalize_hashfile flags */ -#define CSUM_CLOSE 1 -#define CSUM_FSYNC 2 +#define CSUM_CLOSE 1 +#define CSUM_FSYNC 2 +#define CSUM_HASH_IN_STREAM 4 extern struct hashfile *hashfd(int fd, const char *name); extern struct hashfile *hashfd_check(const char *name); |