[PATCH 06/24] pseudo-merge.ch: initial commit
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Mar 20, 2024, 22:05 UTC
- Message-ID
- <c6f9170af0fad0f2b0c2062f43b211b12a362642.1710972293.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1710972293.git.me@ttaylorr.com>
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> --- Makefile | 1 + pseudo-merge.c | 2 ++ pseudo-merge.h | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 pseudo-merge.c create mode 100644 pseudo-merge.h
diff --git a/Makefile b/Makefile index 4e255c81f22..fd050bd9d68 100644 --- a/Makefile +++ b/Makefile @@ -1114,6 +1114,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 00000000000..37e037ba272 --- /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 00000000000..cab8ff6960a --- /dev/null +++ b/pseudo-merge.h @@ -0,0 +1,6 @@ +#ifndef PSEUDO_MERGE_H +#define PSEUDO_MERGE_H + +#include "git-compat-util.h" + +#endif
-- 2.44.0.303.g1dc5e5b124c