From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, rybak.a.v@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 01/10] xdiff/xdiff.h: remove unused flags
Date: Wed, 18 Jul 2018 12:31:47 -0700 [thread overview]
Message-ID: <20180718193156.47365-2-sbeller@google.com> (raw)
In-Reply-To: <20180718193156.47365-1-sbeller@google.com>
These flags were there since the beginning (3443546f6e (Use a *real*
built-in diff generator, 2006-03-24), but were never used. Remove them.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
xdiff/xdiff.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index c1937a29112..2356da5f784 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -52,14 +52,6 @@ extern "C" {
#define XDL_EMIT_FUNCNAMES (1 << 0)
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
-#define XDL_MMB_READONLY (1 << 0)
-
-#define XDL_MMF_ATOMIC (1 << 0)
-
-#define XDL_BDOP_INS 1
-#define XDL_BDOP_CPY 2
-#define XDL_BDOP_INSB 3
-
/* merge simplification levels */
#define XDL_MERGE_MINIMAL 0
#define XDL_MERGE_EAGER 1
--
2.18.0.233.g985f88cf7e-goog
next prev parent reply other threads:[~2018-07-18 19:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 19:31 [PATCHv6 00/10] Reroll of sb/diff-color-move-more Stefan Beller
2018-07-18 19:31 ` Stefan Beller [this message]
2018-07-18 19:31 ` [PATCH 02/10] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-07-18 19:31 ` [PATCH 03/10] t4015: avoid git as a pipe input Stefan Beller
2018-07-18 19:31 ` [PATCH 04/10] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-07-18 19:31 ` [PATCH 05/10] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-07-18 19:31 ` [PATCH 06/10] diff.c: add a blocks mode for moved code detection Stefan Beller
2018-07-18 19:31 ` [PATCH 07/10] diff.c: decouple white space treatment from move detection algorithm Stefan Beller
2018-07-18 19:31 ` [PATCH 08/10] diff.c: factor advance_or_nullify out of mark_color_as_moved Stefan Beller
2018-07-18 19:31 ` [PATCH 09/10] diff.c: add white space mode to move detection that allows indent changes Stefan Beller
2018-07-18 19:31 ` [PATCH 10/10] diff.c: offer config option to control ws handling in move detection Stefan Beller
2018-07-19 19:05 ` [PATCHv6 00/10] Reroll of sb/diff-color-move-more Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180718193156.47365-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rybak.a.v@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.