averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'en/rename-directory-detection'"

Browse Source 
This reverts commit e4bb62fa1e, reversing
changes made to 468165c1d8.

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>
This commit is contained in:
Junio C Hamano
2018-04-11 18:07:11 +09:00
parent 26e47e261e
commit 8b026edac3
9 changed files with 115 additions and 5197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unpack-trees.h
View File

@@ -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,