make the sample pre-commit hook script reject names with newlines, too

diff --git a/ll-merge.h b/ll-merge.h
index 57754cc8ca7b378a86b168a4fd6299fa3dfba045..ff7ca87bfa01d0e9705f4bfd83b9e4d2c155d588 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -5,6 +5,21 @@
 #ifndef LL_MERGE_H
 #define LL_MERGE_H
 
+#define LL_OPT_VIRTUAL_ANCESTOR        (1 << 0)
+#define LL_OPT_FAVOR_MASK      ((1 << 1) | (1 << 2))
+#define LL_OPT_FAVOR_SHIFT 1
+#define LL_OPT_RENORMALIZE     (1 << 3)
+
+static inline int ll_opt_favor(int flag)
+{
+       return (flag & LL_OPT_FAVOR_MASK) >> LL_OPT_FAVOR_SHIFT;
+}
+
+static inline int create_ll_flag(int favor)
+{
+       return ((favor << LL_OPT_FAVOR_SHIFT) & LL_OPT_FAVOR_MASK);
+}
+
 int ll_merge(mmbuffer_t *result_buf,
             const char *path,
             mmfile_t *ancestor, const char *ancestor_label,