Merge branch 'jc/reupdate' into next

* jc/reupdate:
update-index --again: take optional pathspecs
update-index --again
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.

diff --cc checkout-index.c
Simple merge

diff --cc update-index.c
index 061b18c1a568539cbaf2dae3e80c479fe06df2d8,184b2526da58b56b8e808faceb1efc6949d3c831..7db67aacfedaa542b6f64175580ad5e4e4c15e8d
--- 1/update-index.c
--- 2/update-index.c
+++ b/update-index.c
@@@ -379,9 -369,8 +379,9 @@@ static void update_one(const char *path
        if (mark_valid_only) {
                if (mark_valid(p))
                        die("Unable to mark file %s", path);
-               return;
+               goto free_return;
        }
 +      cache_tree_invalidate_path(active_cache_tree, path);
  
        if (force_remove) {
                if (remove_file_from_cache(p))