Re: [PATCH] git-status: Show empty directories

From: konglu@minatec.inpg.fr <konglu@minatec.inpg.fr>
Date: Jun 9, 2012, 20:13 UTC
Message-ID: <20120609221315.Horde.fN5FP3wdC4BP065b3FviijA@webmail.minatec.grenoble-inp.fr>
In-Reply-To: <1339270806-65013-1-git-send-email-muhtasib@gmail.com>

Leila Muhtasib <muhtasib@gmail.com> a écrit :

>  wt-status.c |   24 +++++++++++++++++++-----
>  1 files changed, 19 insertions(+), 5 deletions(-)

Do not forget to also update the test that need 'git status'. For example, most of the tests in t7508 are broken with your patch (the change is not huge, just adding "and directories" at the end of "untracked files:" here and there and maybe some other minor details). Otherwise, the idea seems good to me :).

Show 15 quoted lines

>  	for (i = 0; i < dir.nr; i++) {
>  		struct dir_entry *ent = dir.entries[i];
>  		if (cache_name_is_other(ent->name, ent->len) &&
> -		    match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
> -			string_list_insert(&s->untracked, ent->name);
> +		    match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL)) {
> +			if (is_empty_dir(ent->name)) {
> +				struct strbuf buf_name = STRBUF_INIT;
> +				strbuf_addstr(&buf_name, ent->name);
> +				strbuf_addstr(&buf_name, " (empty directories cannot be added)");
> +				string_list_insert(&s->untracked, buf_name.buf);
> +				strbuf_release(&buf_name);
> +			}
> +			else
> +				string_list_insert(&s->untracked, ent->name);

The structure is
       if (...) {
              /*code*/
       } else {
              /*code*/
       }

Do not forget braces in the "else" part as the firt block needs it.