Sync with maint

diff --git a/builtin/update-index.c b/builtin/update-index.c
index b0e3dc91055ec7e7579fb5f1964879a99fd71606..6271b54adc24c8765ca0b179faf53f6af86dc630 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -400,7 +400,7 @@ static void read_index_info(int line_termination)
 }
 
 static const char * const update_index_usage[] = {
-       N_("git update-index [options] [--] [<file>...]"),
+       N_("git update-index [<options>] [--] [<file>...]"),
        NULL
 };
 
@@ -584,6 +584,7 @@ static int do_reupdate(int ac, const char **av,
                path = xstrdup(ce->name);
                update_one(path);
                free(path);
+               free(old);
                if (save_nr != active_nr)
                        goto redo;
        }