> -----Original Message-----
> From: Stefan Beller [mailto:sbel...@google.com]
> Sent: Monday, December 12, 2016 8:41 PM
> To: gits...@pobox.com
> Cc: git@vger.kernel.org; David Turner; bmw...@google.com; Stefan Beller
> Subject: [PATCH 6/6] rm: add absorb a submodules git dir before deletion
> 
> When deleting a submodule we need to keep the actual git directory around,

Nit: comma after submodule.

> -                                     strbuf_reset(&buf);
> -                                     strbuf_addstr(&buf, path);
> -                                     if (!remove_dir_recursively(&buf, 0)) {
> -                                             removed = 1;
> -                                             if
> (!remove_path_from_gitmodules(path))
> -                                                     gitmodules_modified = 1;
> -                                             strbuf_release(&buf);
> -                                             continue;
> -                                     } else if (!file_exists(path))
> -                                             /* Submodule was removed by 
> user */
> -                                             if
> (!remove_path_from_gitmodules(path))
> -                                                     gitmodules_modified = 1;
> +                                     if (file_exists(path))
> +                                             depopulate_submodule(path);
> +                                     removed = 1;
> +                                     if (!remove_path_from_gitmodules(path))
> +                                             gitmodules_modified = 1;
> +                                     continue;
>                                       /* Fallthrough and let remove_path() 
> fail.
> */

It seems odd to have a continue right before a comment that says "Fallthrough". 
 

Reply via email to