2010/3/11 Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>: > @@ -411,6 +425,8 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) > inside_git_dir = 1; > if (!work_tree_env) > inside_work_tree = 0; > + if (check_repository_format_gently(gitfile_dir, nongit_ok)) > + return NULL; > if (offset != len) { > root_len = offset_1st_component(cwd); > cwd[offset > root_len ? offset : root_len] = '\0'; Something went wrong in rebases and conflicts. gitfile_dir in the above call should be replaced by "." if (check_repository_format_gently(".", nongit_ok)) -- Duy ��.n��������+%������w��{.n��������n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m