development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-mv: Remove dead code branch

Browse source 
The path list builder had a branch for the case the source is not in index, but
this can happen only if the source was a directory. However, in that case we
have already expanded the list to the directory contents and set mode
to WORKING_DIRECTORY, which is tested earlier.

The patch removes the superfluous branch and adds an assert() instead. git-mv
testsuite still passes.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Petr Baudis 2008-07-16 21:11:08 +02:00 committed by Junio C Hamano
parent a08c53a119
commit f6c52fe4e8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
builtin-mv.c
View file

@ -228,15 +228,13 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (mode == WORKING_DIRECTORY)
continue;
if (cache_name_pos(src, strlen(src)) >= 0) {
string_list_insert(src, &deleted);
assert(cache_name_pos(src, strlen(src)) >= 0);
/* destination can be a directory with 1 file inside */
if (string_list_has_string(&overwritten, dst))
string_list_insert(dst, &changed);
else
string_list_insert(dst, &added);
} else
string_list_insert(src, &deleted);
/* destination can be a directory with 1 file inside */
if (string_list_has_string(&overwritten, dst))
string_list_insert(dst, &changed);
else
string_list_insert(dst, &added);
}