git/dir.h, branch v2.15.2

Merge branch 'pc/dir-count-slashes'

2017-06-22T21:15:21Z

Three instances of the same helper function have been consolidated to one. * pc/dir-count-slashes: dir: create function count_slashes()

dir: create function count_slashes()

2017-06-12T20:26:55Z

Similar functions exist in apply.c and builtin/show-branch.c for counting the number of slashes in a string. Also in the later patches, we introduce a third caller for the same. Hence, we unify it now by cleaning the existing functions and declaring a common function count_slashes in dir.h and implementing it in dir.c to remove this code duplication. Mentored-by: Christian Couder Mentored-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Prathamesh Chavan Signed-off-by: Junio C Hamano

Merge branch 'sl/clean-d-ignored-fix'

2017-06-02T06:06:05Z

"git clean -d" used to clean directories that has ignored files, even though the command should not lose ignored ones without "-x". "git status --ignored" did not list ignored and untracked files without "-uall". These have been corrected. * sl/clean-d-ignored-fix: clean: teach clean -d to preserve ignored paths dir: expose cmp_name() and check_contains() dir: hide untracked contents of untracked dirs dir: recurse into untracked dirs for ignored files t7061: status --ignored should search untracked dirs t7300: clean -d should skip dirs with ignored files

dir: expose cmp_name() and check_contains()

2017-05-22T03:14:13Z

We want to use cmp_name() and check_contains() (which both compare `struct dir_entry`s, the former in terms of the sort order, the latter in terms of whether one lexically contains another) outside of dir.c, so we have to (1) change their linkage and (2) rename them as appropriate for the global namespace. The second is achieved by renaming cmp_name() to cmp_dir_entry() and check_contains() to check_dir_entry_contains(). Signed-off-by: Samuel Lijin Signed-off-by: Junio C Hamano

dir: hide untracked contents of untracked dirs

2017-05-22T03:14:09Z

When we taught read_directory_recursive() to recurse into untracked directories in search of ignored files given DIR_SHOW_IGNORED_TOO, that had the side effect of teaching it to collect the untracked contents of untracked directories. It doesn't always make sense to return these, though (we do need them for `clean -d`), so we introduce a flag (DIR_KEEP_UNTRACKED_CONTENTS) to control whether or not read_directory() strips dir->entries of the untracked contents of untracked dirs. We also introduce check_contains() to check if one dir_entry corresponds to a path which contains the path corresponding to another dir_entry. This also fixes known breakages in t7061, since status --ignored now searches untracked directories for ignored files. Signed-off-by: Samuel Lijin Signed-off-by: Junio C Hamano

dir: convert fill_directory to take an index

2017-05-06T10:15:39Z