Merge branch 'bp/name-hash-dirname-fix'
"git add" files in the same directory, but spelling the directory path in different cases on case insensitive filesystem, corrupted the name hash data structure and led to unexpected results. This has been corrected. * bp/name-hash-dirname-fix: name-hash: properly fold directory names in adjust_dirname_case()
This commit is contained in:
@ -699,12 +699,12 @@ void adjust_dirname_case(struct index_state *istate, char *name)
|
||||
if (*ptr == '/') {
|
||||
struct dir_entry *dir;
|
||||
|
||||
ptr++;
|
||||
dir = find_dir_entry(istate, name, ptr - name + 1);
|
||||
dir = find_dir_entry(istate, name, ptr - name);
|
||||
if (dir) {
|
||||
memcpy((void *)startPtr, dir->name + (startPtr - name), ptr - startPtr);
|
||||
startPtr = ptr;
|
||||
startPtr = ptr + 1;
|
||||
}
|
||||
ptr++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user