mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lh/git-file'

Browse Source 
* lh/git-file:
  Teach GIT-VERSION-GEN about the .git file
  Teach git-submodule.sh about the .git file
  Teach resolve_gitlink_ref() about the .git file
  Add platform-independent .git "symlink"
This commit is contained in:
Junio C Hamano
2008-05-05 19:16:16 -07:00
parent 9c36e1700f c48799e560
commit e2e2defc14
8 changed files with 173 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
refs.c
View File

@ -352,6 +352,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
{
int len = strlen(path), retval;
char *gitdir;
const char *tmp;
while (len && path[len-1] == '/')
len--;
@ -359,9 +360,19 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
return -1;
gitdir = xmalloc(len + MAXREFLEN + 8);
memcpy(gitdir, path, len);
memcpy(gitdir + len, "/.git/", 7);
memcpy(gitdir + len, "/.git", 6);
len += 5;
retval = resolve_gitlink_ref_recursive(gitdir, len+6, refname, result, 0);
tmp = read_gitfile_gently(gitdir);
if (tmp) {
free(gitdir);
len = strlen(tmp);
gitdir = xmalloc(len + MAXREFLEN + 3);
memcpy(gitdir, tmp, len);
}
gitdir[len] = '/';
gitdir[++len] = '\0';
retval = resolve_gitlink_ref_recursive(gitdir, len, refname, result, 0);
free(gitdir);
return retval;
}