Re: [PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

2017-05-25 Thread Junio C Hamano
Samuel Lijin writes: > On Wed, May 24, 2017 at 12:14 AM, Torsten Bögershausen wrote: >> >>> diff --git a/builtin/clean.c b/builtin/clean.c >>> index d861f836a..937eb17b6 100644 >>> --- a/builtin/clean.c >>> +++ b/builtin/clean.c >>> @@ -857,6 +857,38 @@ static void interactive_main_loop(void) >>

Re: [PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

2017-05-25 Thread Samuel Lijin
On Wed, May 24, 2017 at 12:14 AM, Torsten Bögershausen wrote: > >> diff --git a/builtin/clean.c b/builtin/clean.c >> index d861f836a..937eb17b6 100644 >> --- a/builtin/clean.c >> +++ b/builtin/clean.c >> @@ -857,6 +857,38 @@ static void interactive_main_loop(void) >> } >> } >> +static

Re: [PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

2017-05-23 Thread Torsten Bögershausen
diff --git a/builtin/clean.c b/builtin/clean.c index d861f836a..937eb17b6 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -857,6 +857,38 @@ static void interactive_main_loop(void) } } +static void correct_untracked_entries(struct dir_struct *dir) +{ + int src, dst, ign;

Re: [PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

2017-05-23 Thread Junio C Hamano
Samuel Lijin writes: > There is an implicit assumption that a directory containing only > untracked and ignored paths should itself be considered untracked. This > makes sense in use cases where we're asking if a directory should be > added to the git database, but not when we're asking if a dire

[PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

2017-05-23 Thread Samuel Lijin
There is an implicit assumption that a directory containing only untracked and ignored paths should itself be considered untracked. This makes sense in use cases where we're asking if a directory should be added to the git database, but not when we're asking if a directory can be safely removed fro