summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2008-07-21 00:25:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-27 22:05:19 (GMT)
commit81dc2307d0ad87a4da2e753a9d1b5586d6456eed (patch)
tree1768cbb9f900c8bbb2be9f08d76bb3e88a703ca0 /read-cache.c
parentf6c52fe4e871d1d07cb7d86692ccf8cc4de54579 (diff)
downloadgit-81dc2307d0ad87a4da2e753a9d1b5586d6456eed.zip
git-81dc2307d0ad87a4da2e753a9d1b5586d6456eed.tar.gz
git-81dc2307d0ad87a4da2e753a9d1b5586d6456eed.tar.bz2
git-mv: Keep moved index entries inact
The rewrite of git-mv from a shell script to a builtin was perhaps a little too straightforward: the git add and git rm queues were emulated directly, which resulted in a rather complicated code and caused an inconsistent behaviour when moving dirty index entries; git mv would update the entry based on working tree state, except in case of overwrites, where the new entry would still have sha1 of the old file. This patch introduces rename_index_entry_at() into the index toolkit, which will rename an entry while removing any entries the new entry might render duplicate. This is then used in git mv instead of all the file queues, resulting in a major simplification of the code and an inevitable change in git mv -n output format. Also the code used to refuse renaming overwriting symlink with a regular file and vice versa; there is no need for that. A few new tests have been added to the testsuite to reflect this change. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index a50a851..6c08803 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -38,6 +38,22 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
istate->cache_changed = 1;
}
+void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
+{
+ struct cache_entry *old = istate->cache[nr], *new;
+ int namelen = strlen(new_name);
+
+ new = xmalloc(cache_entry_size(namelen));
+ copy_cache_entry(new, old);
+ new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
+ new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
+ memcpy(new->name, new_name, namelen + 1);
+
+ cache_tree_invalidate_path(istate->cache_tree, old->name);
+ remove_index_entry_at(istate, nr);
+ add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+}
+
/*
* This only updates the "non-critical" parts of the directory
* cache, ie the parts that aren't tracked by GIT, and only used