From: Junio C Hamano <junkio@cox.net>
Date: Sat, 6 May 2006 07:20:54 +0000 (-0700)
Subject: Merge branch 'jc/reupdate' into next
X-Git-Tag: v1.4.1-rc1~130
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aadc81c13bbb103e7db759ba9a98a6f9509831f1;p=git.git

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.
---

aadc81c13bbb103e7db759ba9a98a6f9509831f1
diff --cc update-index.c
index 061b18c1a,184b2526d..7db67aacf
--- a/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))