Am 30.01.2011 00:45, schrieb Tim Abell:
>> Hmm, not so good. st_ino is always 0 on Windows, so this would make
>> false positives, no?
>
> I tested this on windows 7 under cygwin (which is what I have
> available) and st_ino reports real numbers for me, I also tested that
> attempting to overwrite another file without --force still fails and
> added a new test case for this scenario. I have now made sure that if
> zero is returned then git won't accidentally overwrite other files as
> I hadn't thought of this before. So this patch shouldn't be
> regressive even if other versions of windows or other filesystems
> don't provide valid inode data.
On MinGW on Vista st_ino is zero, git mv refuses to overwrite and the
added case change test fails as a consequence.
>> I wonder if we can make lstat_case() that would only return 0 if it
>> matches exactly the filename, even on FAT. FindFirstFile/FindNextFile
>> should return true file name, I think. If not, we can make
>> lstat_case() take two paths (src and dst) and move all inode
>> comparison code in there. Much cleaner.
>
> I'm afraid this is a bit beyond me at the moment, but I'm fairly
> happy with the solution I have. Thanks for the feedback though.
Hmm, if the patch only works for Cygwin and maybe OS X it's a step
forward, I guess. A more complete solution would be better, of course.
> diff --git a/builtin/mv.c b/builtin/mv.c
> index cdbb094..c2f726a 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -165,17 +165,27 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> } else if (cache_name_pos(src, length) < 0)
> bad = "not under version control";
> else if (lstat(dst, &st) == 0) {
> - bad = "destination exists";
> - if (force) {
> - /*
> - * only files can overwrite each other:
> - * check both source and destination
> - */
> - if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
> - warning("%s; will overwrite!", bad);
> - bad = NULL;
> - } else
> - bad = "Cannot overwrite";
> + /* If we are on a case insensitive file system (windows) and we are only
> + * changing the case of the file then lstat for the destination will
> + * return != 0 because it sees the source file.
> + * To prevent this causing failure, lstat is used to get the inode of the src
> + * and see if it's actually the same file as dst. If the inode == 0 then
> + * we can't tell whether it is the same file so we fail regardless. */
Can you make the lines 80 characters long at most? This subtly helps
avoiding excessive levels of indentation by encouraging to factor out
nice and small functions.
> + struct stat src_st;
> + lstat(src, &src_st);
Shouldn't you check the return value of this call? OK, the source
probably always exists, but still. Oh, we actually know that because
that's the first lstat() call in this for loop. You can reuse its
result instead of calling the function again.
> + if (src_st.st_ino == 0 || src_st.st_ino != st.st_ino) {
It may be nice to avoid adding another level of indentation by combining
this if with the preceding one.
> + bad = "destination exists";
> + if (force) {
> + /*
> + * only files can overwrite each other:
> + * check both source and destination
> + */
> + if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
> + warning("%s; will overwrite!", bad);
> + bad = NULL;
> + } else
> + bad = "Cannot overwrite";
> + }
> }
> } else if (string_list_has_string(&src_for_dst, dst))
> bad = "multiple sources for the same target";
René
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html