From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Jan 2011 16:25:31 +0000 (-0800)
Subject: Merge branch 'nd/maint-relative' into maint
X-Git-Tag: v1.7.4-rc3~5^2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0bc6180bcbe6bd821ac8cf2178cb13ff628b4f69?hp=3f142468997f9d14d8051a96b2e9db265d41ac0d

Merge branch 'nd/maint-relative' into maint

* nd/maint-relative:
get_cwd_relative(): do not misinterpret root path
---

diff --git a/dir.c b/dir.c
index b2dfb69eb5..b68750450c 100644
--- a/dir.c
+++ b/dir.c
@@ -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;
 	}
 }