Merge branch 'nd/maint-relative'

gitster · gitster · commit 20cb8e202520 · 2010-12-16T12:49:48.000-08:00
* nd/maint-relative:
  get_cwd_relative(): do not misinterpret root path
diff --git a/dir.c b/dir.c
@@ -1033,6 +1033,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;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1033,6 +1033,12 @@ char get_relative_cwd(char buffer, int size, const char *dir)`
`1033`	`1033`	`case '/':`
`1034`	`1034`	`return cwd + 1;`
`1035`	`1035`	`default:`
	`1036`	`+ /*`
	`1037`	`+ * dir can end with a path separator when it's root`
	`1038`	`+ * directory. Return proper prefix in that case.`
	`1039`	`+ */`
	`1040`	`+ if (dir[-1] == '/')`
	`1041`	`+ return cwd;`
`1036`	`1042`	`return NULL;`
`1037`	`1043`	`}`
`1038`	`1044`	`}`