summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 09:07:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 09:07:11 (GMT)
commit8b026edac3104ecc40a68fd58b764fb3c717babb (patch)
treed42982dc7593d566b4ba43b06f23f86014124d40 /unpack-trees.h
parent26e47e261e969491ad4e3b6c298450c061749c9e (diff)
downloadgit-8b026edac3104ecc40a68fd58b764fb3c717babb.zip
git-8b026edac3104ecc40a68fd58b764fb3c717babb.tar.gz
git-8b026edac3104ecc40a68fd58b764fb3c717babb.tar.bz2
Revert "Merge branch 'en/rename-directory-detection'"
This reverts commit e4bb62fa1eeee689744b413e29a50b4d1dae6886, reversing changes made to 468165c1d8a442994a825f3684528361727cd8c0. The topic appears to inflict severe regression in renaming merges, even though the promise of it was that it would improve them. We do not yet know which exact change in the topic was wrong, but in the meantime, let's play it safe and revert it out of 'master' before real Git-using projects are harmed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 41178ad..6c48117 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,7 +1,6 @@
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
-#include "tree-walk.h"
#include "string-list.h"
#define MAX_UNPACK_TREES 8
@@ -79,9 +78,6 @@ struct unpack_trees_options {
extern int unpack_trees(unsigned n, struct tree_desc *t,
struct unpack_trees_options *options);
-int verify_uptodate(const struct cache_entry *ce,
- struct unpack_trees_options *o);
-
int threeway_merge(const struct cache_entry * const *stages,
struct unpack_trees_options *o);
int twoway_merge(const struct cache_entry * const *src,