diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 09:07:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 09:07:11 (GMT) |
| commit | 8b026edac3104ecc40a68fd58b764fb3c717babb (patch) | |
| tree | d42982dc7593d566b4ba43b06f23f86014124d40 /unpack-trees.c | |
| parent | 26e47e261e969491ad4e3b6c298450c061749c9e (diff) | |
| download | git-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.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 79fd970..e737450 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1509,8 +1509,8 @@ static int verify_uptodate_1(const struct cache_entry *ce, add_rejected_path(o, error_type, ce->name); } -int verify_uptodate(const struct cache_entry *ce, - struct unpack_trees_options *o) +static int verify_uptodate(const struct cache_entry *ce, + struct unpack_trees_options *o) { if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) return 0; |