Commits

Petr Baudis  committed f6c52fe

git-mv: Remove dead code branch

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>

  • Participants
  • Parent commits a08c53a

Comments (0)

Files changed (1)

File builtin-mv.c

 		if (mode == WORKING_DIRECTORY)
 			continue;
 
-		if (cache_name_pos(src, strlen(src)) >= 0) {
-			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);
-		} else
+		assert(cache_name_pos(src, strlen(src)) >= 0);
+
+		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);
 	}