Skip to content

Commit

Permalink
enter_repo: allow .git files in strict mode
Browse files Browse the repository at this point in the history
Strict mode is about not guessing where .git is. If the user points to a
.git file, we know exactly where the target .git dir will be. This makes
it possible to serve .git files as repository on the server side.

This may be needed even in local clone case because transport.c code
uses upload-pack for fetching remote refs. But right now the
clone/transport code goes with non-strict.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Sep 28, 2015
1 parent 0f64cc4 commit 1f5fbe1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
9 changes: 7 additions & 2 deletions path.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,13 @@ const char *enter_repo(const char *path, int strict)
return NULL;
path = validated_path;
}
else if (chdir(path))
return NULL;
else {
const char *gitfile = read_gitfile(path);
if (gitfile)
path = gitfile;
if (chdir(path))
return NULL;
}

if (is_git_directory(".")) {
set_git_dir(".");
Expand Down
10 changes: 10 additions & 0 deletions t/t0002-gitfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,14 @@ test_expect_success 'enter_repo linked checkout' '
test_cmp expected actual
'

test_expect_success 'enter_repo strict mode' '
git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual &&
cat >expected <<-\EOF &&
946e985ab20de757ca5b872b16d64e92ff3803a9 HEAD
946e985ab20de757ca5b872b16d64e92ff3803a9 refs/heads/master
946e985ab20de757ca5b872b16d64e92ff3803a9 refs/tags/foo
EOF
test_cmp expected actual
'

test_done

0 comments on commit 1f5fbe1

Please sign in to comment.