undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach resolve_gitlink_ref() about the .git file

Browse Source 
When .git in a submodule is a file, resolve_gitlink_ref() needs to pick up
the real GIT_DIR of the submodule from that file.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Hjemli 2008-02-20 23:13:14 +01:00 committed by Junio C Hamano
parent b44ebb19e3
commit 842abf06f3
1 changed files with 13 additions and 2 deletions
Show Stats 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; int len = strlen(path), retval;
char *gitdir; char *gitdir;
const char *tmp;
while (len && path[len-1] == '/') while (len && path[len-1] == '/')
len--; len--;
@ -359,9 +360,19 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
return -1; return -1;
gitdir = xmalloc(len + MAXREFLEN + 8); gitdir = xmalloc(len + MAXREFLEN + 8);
memcpy(gitdir, path, len); 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); free(gitdir);
return retval; return retval;
} }