diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-14 16:58:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:58:44 -0700 |
| commit | 5708a6666dd9f6d233836fdc86afef0a408c01b6 (patch) | |
| tree | ce9b5036804fa69b113e9d8a16dfc1ee40502401 /read-tree.c | |
| parent | Merge branch 'lt/diff' into next (diff) | |
| parent | Simplify "git reset --hard" (diff) | |
| download | tgif-5708a6666dd9f6d233836fdc86afef0a408c01b6.tar.xz | |
Merge branch 'lt/oneway' into next
* lt/oneway:
Simplify "git reset --hard"
Allow one-way tree merge to remove old files
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c index c25385d79f..7c830312c4 100644 --- a/read-tree.c +++ b/read-tree.c @@ -720,7 +720,7 @@ static int oneway_merge(struct cache_entry **src) if (!a) { invalidate_ce_path(old); - return 0; + return deleted_entry(old, NULL); } if (old && same(old, a)) { return keep_entry(old); |