Merge branch 'mm/status-porcelain-format-i18n-fix' into maint

diff --git a/builtin/update-index.c b/builtin/update-index.c
index e3a10d706d406845b74b2cc0c9e9a120be6adce0..aaa6f78f1629311257291ba1075ddd7c7dd1a3ed 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -12,6 +12,7 @@
 #include "resolve-undo.h"
 #include "parse-options.h"
 #include "pathspec.h"
+#include "dir.h"
 
 /*
  * Default to not allowing changes to the list of files. The
@@ -564,7 +565,7 @@ static int do_reupdate(int ac, const char **av,
                struct cache_entry *old = NULL;
                int save_nr;
 
-               if (ce_stage(ce) || !ce_path_match(ce, &pathspec))
+               if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
                        continue;
                if (has_head)
                        old = read_one_ent(NULL, head_sha1,