diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-05-23 17:26:26 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-24 11:40:41 -0700 |
| commit | 89f47c45df7ff65f555548718641c4610f466f08 (patch) | |
| tree | dba2f842c295c81752fd92f7cca1031fb8fdbf99 | |
| parent | pack-bitmap: move some initialization to `bitmap_writer_init()` (diff) | |
| download | git-89f47c45df7ff65f555548718641c4610f466f08.tar.gz git-89f47c45df7ff65f555548718641c4610f466f08.zip | |
pseudo-merge.ch: initial commit
Add a new (empty) header file to contain the implementation for
selecting, reading, and applying pseudo-merge bitmaps.
For now this header and its corresponding implementation are left
empty, but they will evolve over the course of subsequent commit(s).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | pseudo-merge.c | 2 | ||||
| -rw-r--r-- | pseudo-merge.h | 6 |
3 files changed, 9 insertions, 0 deletions
@@ -1119,6 +1119,7 @@ LIB_OBJS += prompt.o LIB_OBJS += protocol.o LIB_OBJS += protocol-caps.o LIB_OBJS += prune-packed.o +LIB_OBJS += pseudo-merge.o LIB_OBJS += quote.o LIB_OBJS += range-diff.o LIB_OBJS += reachable.o diff --git a/pseudo-merge.c b/pseudo-merge.c new file mode 100644 index 0000000000..37e037ba27 --- /dev/null +++ b/pseudo-merge.c @@ -0,0 +1,2 @@ +#include "git-compat-util.h" +#include "pseudo-merge.h" diff --git a/pseudo-merge.h b/pseudo-merge.h new file mode 100644 index 0000000000..cab8ff6960 --- /dev/null +++ b/pseudo-merge.h @@ -0,0 +1,6 @@ +#ifndef PSEUDO_MERGE_H +#define PSEUDO_MERGE_H + +#include "git-compat-util.h" + +#endif |