summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-04-22 20:17:19 +0000
committerJunio C Hamano <gitster@pobox.com>2023-04-24 12:47:32 -0700
commit23a517e4156714c3f8c8a4e36beccfee1d76ff1f (patch)
treeabc2897e11a5f4f672399edbff25594b2f8842b9
parent592fc5b3495bf4ff17252d31109f1d9c0134684b (diff)
downloadgit-23a517e4156714c3f8c8a4e36beccfee1d76ff1f.tar.gz
tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
S_DIFFTREE_IFXMIN_NEQ is *only* used in tree-diff.c, so there is no point exposing it in cache.h. Move it to tree-diff.c. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h15
-rw-r--r--tree-diff.c13
2 files changed, 13 insertions, 15 deletions
diff --git a/cache.h b/cache.h
index ad741e70bc..7a46f300d9 100644
--- a/cache.h
+++ b/cache.h
@@ -11,21 +11,6 @@
#include "statinfo.h"
/*
- * Some mode bits are also used internally for computations.
- *
- * They *must* not overlap with any valid modes, and they *must* not be emitted
- * to outside world - i.e. appear on disk or network. In other words, it's just
- * temporary fields, which we internally use, but they have to stay in-house.
- *
- * ( such approach is valid, as standard S_IF* fits into 16 bits, and in Git
- * codebase mode is `unsigned int` which is assumed to be at least 32 bits )
- */
-
-/* used internally in tree-diff */
-#define S_DIFFTREE_IFXMIN_NEQ 0x80000000
-
-
-/*
* Basic data structures for the directory cache
*/
diff --git a/tree-diff.c b/tree-diff.c
index 69031d7cba..a76e6dae61 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -7,6 +7,19 @@
#include "tree.h"
/*
+ * Some mode bits are also used internally for computations.
+ *
+ * They *must* not overlap with any valid modes, and they *must* not be emitted
+ * to outside world - i.e. appear on disk or network. In other words, it's just
+ * temporary fields, which we internally use, but they have to stay in-house.
+ *
+ * ( such approach is valid, as standard S_IF* fits into 16 bits, and in Git
+ * codebase mode is `unsigned int` which is assumed to be at least 32 bits )
+ */
+
+#define S_DIFFTREE_IFXMIN_NEQ 0x80000000
+
+/*
* internal mode marker, saying a tree entry != entry of tp[imin]
* (see ll_diff_tree_paths for what it means there)
*