Merge branch 'jc/t5551-posix-sed-bre' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index 4a881ab27fd4efa0bb16955bb2e8944c1461b11c..7b91d52f39004dbfcc9b0dc5b8aadf3df5c6d320 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -12,7 +12,7 @@
 #include "submodule.h"
 
 static const char * const builtin_rm_usage[] = {
-       "git rm [options] [--] <file>...",
+       N_("git rm [options] [--] <file>..."),
        NULL
 };
 
@@ -110,7 +110,7 @@ static int check_local_mod(unsigned char *head, int index_only)
                ce = active_cache[pos];
 
                if (lstat(ce->name, &st) < 0) {
-                       if (errno != ENOENT)
+                       if (errno != ENOENT && errno != ENOTDIR)
                                warning("'%s': %s", ce->name, strerror(errno));
                        /* It already vanished from the working tree */
                        continue;
@@ -203,13 +203,13 @@ static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
 static int ignore_unmatch = 0;
 
 static struct option builtin_rm_options[] = {
-       OPT__DRY_RUN(&show_only, "dry run"),
-       OPT__QUIET(&quiet, "do not list removed files"),
-       OPT_BOOLEAN( 0 , "cached",         &index_only, "only remove from the index"),
-       OPT__FORCE(&force, "override the up-to-date check"),
-       OPT_BOOLEAN('r', NULL,             &recursive,  "allow recursive removal"),
+       OPT__DRY_RUN(&show_only, N_("dry run")),
+       OPT__QUIET(&quiet, N_("do not list removed files")),
+       OPT_BOOLEAN( 0 , "cached",         &index_only, N_("only remove from the index")),
+       OPT__FORCE(&force, N_("override the up-to-date check")),
+       OPT_BOOLEAN('r', NULL,             &recursive,  N_("allow recursive removal")),
        OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
-                               "exit with a zero status even if nothing matched"),
+                               N_("exit with a zero status even if nothing matched")),
        OPT_END(),
 };
 
@@ -234,6 +234,21 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
        if (read_cache() < 0)
                die(_("index file corrupt"));
 
+       /*
+        * Drop trailing directory separators from directories so we'll find
+        * submodules in the index.
+        */
+       for (i = 0; i < argc; i++) {
+               size_t pathlen = strlen(argv[i]);
+               if (pathlen && is_dir_sep(argv[i][pathlen - 1]) &&
+                   is_directory(argv[i])) {
+                       do {
+                               pathlen--;
+                       } while (pathlen && is_dir_sep(argv[i][pathlen - 1]));
+                       argv[i] = xmemdupz(argv[i], pathlen);
+               }
+       }
+
        pathspec = get_pathspec(prefix, argv);
        refresh_index(&the_index, REFRESH_QUIET, pathspec, NULL, NULL);