From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 23:58:44 +0000 (-0700)
Subject: Merge branch 'lt/oneway' into next
X-Git-Tag: v1.4.1-rc1~114
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5708a6666dd9f6d233836fdc86afef0a408c01b6;p=git.git

Merge branch 'lt/oneway' into next

* lt/oneway:
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files
---

5708a6666dd9f6d233836fdc86afef0a408c01b6
diff --cc read-tree.c
index c25385d79,11157f424..7c830312c
--- a/read-tree.c
+++ b/read-tree.c
@@@ -718,10 -683,8 +718,10 @@@ static int oneway_merge(struct cache_en
  		return error("Cannot do a oneway merge of %d trees",
  			     merge_size);
  
 -	if (!a)
 +	if (!a) {
 +		invalidate_ce_path(old);
- 		return 0;
+ 		return deleted_entry(old, NULL);
 +	}
  	if (old && same(old, a)) {
  		return keep_entry(old);
  	}