mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-04 12:14:50 +00:00
125655fe3f
This restores a behavior that was accidentally lost during some diff refactoring where an untracked directory that contains a .git item should be treated as IGNORED, not as UNTRACKED. The submodule code already detects this, but the diff code was not handling the scenario right. This also updates a number of existing tests that were actually exercising the behavior but did not have the right expectations in place. It actually makes the new `test_diff_submodules__diff_ignore_options` test feel much better because the "not-a-submodule" entries are now ignored instead of showing up as untracked items. Fixes #1697
120 lines
2.9 KiB
C
120 lines
2.9 KiB
C
#include "clar_libgit2.h"
|
|
#include "buffer.h"
|
|
#include "path.h"
|
|
#include "util.h"
|
|
#include "posix.h"
|
|
#include "submodule_helpers.h"
|
|
|
|
/* rewrite gitmodules -> .gitmodules
|
|
* rewrite the empty or relative urls inside each module
|
|
* rename the .gitted directory inside any submodule to .git
|
|
*/
|
|
void rewrite_gitmodules(const char *workdir)
|
|
{
|
|
git_buf in_f = GIT_BUF_INIT, out_f = GIT_BUF_INIT, path = GIT_BUF_INIT;
|
|
FILE *in, *out;
|
|
char line[256];
|
|
|
|
cl_git_pass(git_buf_joinpath(&in_f, workdir, "gitmodules"));
|
|
cl_git_pass(git_buf_joinpath(&out_f, workdir, ".gitmodules"));
|
|
|
|
cl_assert((in = fopen(in_f.ptr, "r")) != NULL);
|
|
cl_assert((out = fopen(out_f.ptr, "w")) != NULL);
|
|
|
|
while (fgets(line, sizeof(line), in) != NULL) {
|
|
char *scan = line;
|
|
|
|
while (*scan == ' ' || *scan == '\t') scan++;
|
|
|
|
/* rename .gitted -> .git in submodule directories */
|
|
if (git__prefixcmp(scan, "path =") == 0) {
|
|
scan += strlen("path =");
|
|
while (*scan == ' ') scan++;
|
|
|
|
git_buf_joinpath(&path, workdir, scan);
|
|
git_buf_rtrim(&path);
|
|
git_buf_joinpath(&path, path.ptr, ".gitted");
|
|
|
|
if (!git_buf_oom(&path) && p_access(path.ptr, F_OK) == 0) {
|
|
git_buf_joinpath(&out_f, workdir, scan);
|
|
git_buf_rtrim(&out_f);
|
|
git_buf_joinpath(&out_f, out_f.ptr, ".git");
|
|
|
|
if (!git_buf_oom(&out_f))
|
|
p_rename(path.ptr, out_f.ptr);
|
|
}
|
|
}
|
|
|
|
/* copy non-"url =" lines verbatim */
|
|
if (git__prefixcmp(scan, "url =") != 0) {
|
|
fputs(line, out);
|
|
continue;
|
|
}
|
|
|
|
/* convert relative URLs in "url =" lines */
|
|
scan += strlen("url =");
|
|
while (*scan == ' ') scan++;
|
|
|
|
if (*scan == '.') {
|
|
git_buf_joinpath(&path, workdir, scan);
|
|
git_buf_rtrim(&path);
|
|
} else if (!*scan || *scan == '\n') {
|
|
git_buf_joinpath(&path, workdir, "../testrepo.git");
|
|
} else {
|
|
fputs(line, out);
|
|
continue;
|
|
}
|
|
|
|
git_path_prettify(&path, path.ptr, NULL);
|
|
git_buf_putc(&path, '\n');
|
|
cl_assert(!git_buf_oom(&path));
|
|
|
|
fwrite(line, scan - line, sizeof(char), out);
|
|
fputs(path.ptr, out);
|
|
}
|
|
|
|
fclose(in);
|
|
fclose(out);
|
|
|
|
cl_must_pass(p_unlink(in_f.ptr));
|
|
|
|
git_buf_free(&in_f);
|
|
git_buf_free(&out_f);
|
|
git_buf_free(&path);
|
|
}
|
|
|
|
git_repository *setup_fixture_submodules(void)
|
|
{
|
|
git_repository *repo = cl_git_sandbox_init("submodules");
|
|
|
|
cl_fixture_sandbox("testrepo.git");
|
|
|
|
rewrite_gitmodules(git_repository_workdir(repo));
|
|
p_rename("submodules/testrepo/.gitted", "submodules/testrepo/.git");
|
|
|
|
return repo;
|
|
}
|
|
|
|
git_repository *setup_fixture_submod2(void)
|
|
{
|
|
git_repository *repo = cl_git_sandbox_init("submod2");
|
|
|
|
cl_fixture_sandbox("submod2_target");
|
|
p_rename("submod2_target/.gitted", "submod2_target/.git");
|
|
|
|
rewrite_gitmodules(git_repository_workdir(repo));
|
|
p_rename("submod2/not-submodule/.gitted", "submod2/not-submodule/.git");
|
|
p_rename("submod2/not/.gitted", "submod2/not/.git");
|
|
|
|
return repo;
|
|
}
|
|
|
|
void cleanup_fixture_submodules(void)
|
|
{
|
|
cl_git_sandbox_cleanup();
|
|
|
|
/* just try to clean up both possible extras */
|
|
cl_fixture_cleanup("testrepo.git");
|
|
cl_fixture_cleanup("submod2_target");
|
|
}
|