Merge branch 'nd/maint-relative' into maint

* nd/maint-relative:
  get_cwd_relative(): do not misinterpret root path
This commit is contained in:
Junio C Hamano 2011-01-19 08:25:31 -08:00
commit 0bc6180bcb

6
dir.c
View File

@ -965,6 +965,12 @@ char *get_relative_cwd(char *buffer, int size, const char *dir)
case '/':
return cwd + 1;
default:
/*
* dir can end with a path separator when it's root
* directory. Return proper prefix in that case.
*/
if (dir[-1] == '/')
return cwd;
return NULL;
}
}