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>

diff --git a/Makefile b/Makefile
index 1e31acc72eca23274f6ca0b00347f5de12f3a4e6..6a3d164fdf8af5c2c57589b1116ecf922d8500eb 100644 (file)
--- 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 (file)
index 0000000..37e037b
--- /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 (file)
index 0000000..cab8ff6
--- /dev/null
+++ b/pseudo-merge.h
@@ -0,0 +1,6 @@
+#ifndef PSEUDO_MERGE_H
+#define PSEUDO_MERGE_H
+
+#include "git-compat-util.h"
+
+#endif