|
|
|
@ -2244,7 +2244,8 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
@@ -2244,7 +2244,8 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
|
|
|
|
|
pos = cache_name_pos(path, strlen(path)); |
|
|
|
|
if (pos >= 0) |
|
|
|
|
; /* path is in the index */ |
|
|
|
|
else if (!strcmp(active_cache[-1 - pos]->name, path)) |
|
|
|
|
else if (-1 - pos < active_nr && |
|
|
|
|
!strcmp(active_cache[-1 - pos]->name, path)) |
|
|
|
|
; /* path is in the index, unmerged */ |
|
|
|
|
else |
|
|
|
|
die("no such path '%s' in HEAD", path); |
|
|
|
|