Re: [PATCH 2/4] rev-parse: make --git-dir return /.git instead of //.git
- From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
- Date
- Feb 11, 2010, 10:07 UTC
- Message-ID
- <fcaeb9bf1002110207i54366c2doa5ca951d2e87876d@mail.gmail.com>
- In-Reply-To
- <201002092018.55951.j6t@kdbg.org>
On Wed, Feb 10, 2010 at 2:18 AM, Johannes Sixt <j6t@kdbg.org> wrote:
Show 27 quoted lines
> On Dienstag, 9. Februar 2010, Nguyễn Thái Ngọc Duy wrote:
>> @@ -647,7 +647,7 @@ int cmd_rev_parse(int argc, const char **argv, const
>> char *prefix) }
>> if (!getcwd(cwd, PATH_MAX))
>> die_errno("unable to get current working directory");
>> - printf("%s/.git\n", cwd);
>> + printf("%s%s.git\n", cwd, *cwd == '/' && cwd[1] == '\0' ? "" : "/");
>
> On Windows, when you are in the root of a drive, then cwd is "C:/", i.e. there
> is a trailing slash just as in the Unix root directory. But you do not take
> care of this situation. That is, you would print "C://".
>
> How about:
>
> static inline int is_root_path(const char *path)
> {
> if (has_dos_drive_prefix(path))
> path += 2;
> while (is_dir_sep(*path))
> path++;
> return !*path;
> }
>
> and use it though-out your series?
>
> (Simplify the loop to 'return is_dir_sep(*path) && !path[1];' if you can
> assume that paths are nomalized.)And return the length of root_path, so that I can use this function in in setup_git_directory_gently() too. Yeah.
-- Duy