Merge branch 'nd/root-git'

* nd/root-git:
  Add test for using Git at root of file system
  Support working directory located at root
  Move offset_1st_component() to path.c
  init-db, rev-parse --git-dir: do not append redundant slash
  make_absolute_path(): Do not append redundant slash

Conflicts:
	setup.c
	sha1_file.c

diff --cc builtin-rev-parse.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc path.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc sha1_file.c
index c23cc5e6e19a2d8c9a92161b0a5d62a5ef8e920b,923d9d1cd10e65f72b226fff0b215bc8ac31ccf1..a08a9d08808bdb2f4a138d7e6f602b61fc093c1b
--- 1/sha1_file.c
--- 2/sha1_file.c
+++ b/sha1_file.c
@@@ -35,13 -35,54 +35,6 @@@ static size_t sz_fmt(size_t s) { retur
  
  const unsigned char null_sha1[20];
  
- static inline int offset_1st_component(const char *path)
 -const signed char hexval_table[256] = {
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 00-07 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 08-0f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 10-17 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 18-1f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 20-27 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 28-2f */
 -        0,  1,  2,  3,  4,  5,  6,  7,                /* 30-37 */
 -        8,  9, -1, -1, -1, -1, -1, -1,                /* 38-3f */
 -       -1, 10, 11, 12, 13, 14, 15, -1,                /* 40-47 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 48-4f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 50-57 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 58-5f */
 -       -1, 10, 11, 12, 13, 14, 15, -1,                /* 60-67 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 68-67 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 70-77 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 78-7f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 80-87 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 88-8f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 90-97 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* 98-9f */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* a0-a7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* a8-af */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* b0-b7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* b8-bf */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* c0-c7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* c8-cf */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* d0-d7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* d8-df */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* e0-e7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* e8-ef */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* f0-f7 */
 -       -1, -1, -1, -1, -1, -1, -1, -1,                /* f8-ff */
 -};
 -
 -int get_sha1_hex(const char *hex, unsigned char *sha1)
--{
-       if (has_dos_drive_prefix(path))
-               return 2 + (path[2] == '/');
-       return *path == '/';
 -      int i;
 -      for (i = 0; i < 20; i++) {
 -              unsigned int val = (hexval(hex[0]) << 4) | hexval(hex[1]);
 -              if (val & ~0xff)
 -                      return -1;
 -              *sha1++ = val;
 -              hex += 2;
 -      }
 -      return 0;
--}
--
  int safe_create_leading_directories(char *path)
  {
        char *pos = path + offset_1st_component(path);