From: Taylor Blau Date: Thu, 23 May 2024 21:26:26 +0000 (-0400) Subject: pseudo-merge.ch: initial commit X-Git-Tag: v2.46.0-rc0~36^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89f47c45df7ff65f555548718641c4610f466f08;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 1e31acc72e..6a3d164fdf 100644 --- a/Makefile +++ b/Makefile @@ -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