summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-15 23:00:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-18 17:00:59 (GMT)
commitd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 (patch)
treec248f1a5ea841d2ac72cfb6aa46b2370ce9b8460 /read-cache.c
parentc82efafcfa741cdddbc68379c1905953f58ef21d (diff)
downloadgit-d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65.zip
git-d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65.tar.gz
git-d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65.tar.bz2
reset --hard/read-tree --reset -u: remove unmerged new paths
When aborting a failed merge that has brought in a new path using "git reset --hard" or "git read-tree --reset -u", we used to first forget about the new path (via read_cache_unmerged) and then matched the working tree to what is recorded in the index, thus ending up leaving the new path in the work tree. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/read-cache.c b/read-cache.c
index 8f96fd1..15e1a9d 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1460,23 +1460,28 @@ int write_index(const struct index_state *istate, int newfd)
int read_index_unmerged(struct index_state *istate)
{
int i;
- struct cache_entry **dst;
- struct cache_entry *last = NULL;
+ int unmerged = 0;
read_index(istate);
- dst = istate->cache;
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
- if (ce_stage(ce)) {
- remove_name_hash(ce);
- if (last && !strcmp(ce->name, last->name))
- continue;
- cache_tree_invalidate_path(istate->cache_tree, ce->name);
- last = ce;
+ struct cache_entry *new_ce;
+ int size, len;
+
+ if (!ce_stage(ce))
continue;
- }
- *dst++ = ce;
+ unmerged = 1;
+ len = strlen(ce->name);
+ size = cache_entry_size(len);
+ new_ce = xcalloc(1, size);
+ hashcpy(new_ce->sha1, ce->sha1);
+ memcpy(new_ce->name, ce->name, len);
+ new_ce->ce_flags = create_ce_flags(len, 0);
+ new_ce->ce_mode = ce->ce_mode;
+ if (add_index_entry(istate, new_ce, 0))
+ return error("%s: cannot drop to stage #0",
+ ce->name);
+ i = index_name_pos(istate, new_ce->name, len);
}
- istate->cache_nr = dst - istate->cache;
- return !!last;
+ return unmerged;
}