mirror of
				https://git.proxmox.com/git/libgit2
				synced 2025-11-04 10:33:00 +00:00 
			
		
		
		
	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
		
			
				
	
	
		
			225 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			225 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "clar_libgit2.h"
 | 
						|
#include "buffer.h"
 | 
						|
#include "path.h"
 | 
						|
#include "posix.h"
 | 
						|
#include "status_helpers.h"
 | 
						|
#include "../submodule/submodule_helpers.h"
 | 
						|
 | 
						|
static git_repository *g_repo = NULL;
 | 
						|
 | 
						|
void test_status_submodules__initialize(void)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__cleanup(void)
 | 
						|
{
 | 
						|
	cleanup_fixture_submodules();
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__api(void)
 | 
						|
{
 | 
						|
	git_submodule *sm;
 | 
						|
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
 | 
						|
	cl_assert(git_submodule_lookup(NULL, g_repo, "nonexistent") == GIT_ENOTFOUND);
 | 
						|
 | 
						|
	cl_assert(git_submodule_lookup(NULL, g_repo, "modified") == GIT_ENOTFOUND);
 | 
						|
 | 
						|
	cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo"));
 | 
						|
	cl_assert(sm != NULL);
 | 
						|
	cl_assert_equal_s("testrepo", git_submodule_name(sm));
 | 
						|
	cl_assert_equal_s("testrepo", git_submodule_path(sm));
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__0(void)
 | 
						|
{
 | 
						|
	int counts = 0;
 | 
						|
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
 | 
						|
	cl_assert(git_path_isdir("submodules/.git"));
 | 
						|
	cl_assert(git_path_isdir("submodules/testrepo/.git"));
 | 
						|
	cl_assert(git_path_isfile("submodules/.gitmodules"));
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach(g_repo, cb_status__count, &counts)
 | 
						|
	);
 | 
						|
 | 
						|
	cl_assert_equal_i(6, counts);
 | 
						|
}
 | 
						|
 | 
						|
static const char *expected_files[] = {
 | 
						|
	".gitmodules",
 | 
						|
	"added",
 | 
						|
	"deleted",
 | 
						|
	"ignored",
 | 
						|
	"modified",
 | 
						|
	"untracked"
 | 
						|
};
 | 
						|
 | 
						|
static unsigned int expected_status[] = {
 | 
						|
	GIT_STATUS_WT_MODIFIED,
 | 
						|
	GIT_STATUS_INDEX_NEW,
 | 
						|
	GIT_STATUS_INDEX_DELETED,
 | 
						|
	GIT_STATUS_IGNORED,
 | 
						|
	GIT_STATUS_WT_MODIFIED,
 | 
						|
	GIT_STATUS_WT_NEW
 | 
						|
};
 | 
						|
 | 
						|
static int cb_status__match(const char *p, unsigned int s, void *payload)
 | 
						|
{
 | 
						|
	status_entry_counts *counts = payload;
 | 
						|
	int idx = counts->entry_count++;
 | 
						|
 | 
						|
	cl_assert_equal_s(counts->expected_paths[idx], p);
 | 
						|
	cl_assert(counts->expected_statuses[idx] == s);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__1(void)
 | 
						|
{
 | 
						|
	status_entry_counts counts;
 | 
						|
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
 | 
						|
	cl_assert(git_path_isdir("submodules/.git"));
 | 
						|
	cl_assert(git_path_isdir("submodules/testrepo/.git"));
 | 
						|
	cl_assert(git_path_isfile("submodules/.gitmodules"));
 | 
						|
 | 
						|
	memset(&counts, 0, sizeof(counts));
 | 
						|
	counts.expected_paths = expected_files;
 | 
						|
	counts.expected_statuses = expected_status;
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach(g_repo, cb_status__match, &counts)
 | 
						|
	);
 | 
						|
 | 
						|
	cl_assert_equal_i(6, counts.entry_count);
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__single_file(void)
 | 
						|
{
 | 
						|
	unsigned int status = 0;
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
	cl_git_pass( git_status_file(&status, g_repo, "testrepo") );
 | 
						|
	cl_assert(!status);
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__moved_head(void)
 | 
						|
{
 | 
						|
	git_submodule *sm;
 | 
						|
	git_repository *smrepo;
 | 
						|
	git_oid oid;
 | 
						|
	git_status_options opts = GIT_STATUS_OPTIONS_INIT;
 | 
						|
	status_entry_counts counts;
 | 
						|
	static const char *expected_files_with_sub[] = {
 | 
						|
		".gitmodules",
 | 
						|
		"added",
 | 
						|
		"deleted",
 | 
						|
		"ignored",
 | 
						|
		"modified",
 | 
						|
		"testrepo",
 | 
						|
		"untracked"
 | 
						|
	};
 | 
						|
	static unsigned int expected_status_with_sub[] = {
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_INDEX_NEW,
 | 
						|
		GIT_STATUS_INDEX_DELETED,
 | 
						|
		GIT_STATUS_IGNORED,
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_WT_NEW
 | 
						|
	};
 | 
						|
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
 | 
						|
	cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo"));
 | 
						|
	cl_git_pass(git_submodule_open(&smrepo, sm));
 | 
						|
 | 
						|
	/* move submodule HEAD to c47800c7266a2be04c571c04d5a6614691ea99bd */
 | 
						|
	cl_git_pass(
 | 
						|
		git_oid_fromstr(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd"));
 | 
						|
	cl_git_pass(git_repository_set_head_detached(smrepo, &oid));
 | 
						|
 | 
						|
	/* first do a normal status, which should now include the submodule */
 | 
						|
 | 
						|
	memset(&counts, 0, sizeof(counts));
 | 
						|
	counts.expected_paths = expected_files_with_sub;
 | 
						|
	counts.expected_statuses = expected_status_with_sub;
 | 
						|
 | 
						|
	opts.flags = GIT_STATUS_OPT_DEFAULTS;
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
 | 
						|
	cl_assert_equal_i(7, counts.entry_count);
 | 
						|
 | 
						|
	/* try again with EXCLUDE_SUBMODULES which should skip it */
 | 
						|
 | 
						|
	memset(&counts, 0, sizeof(counts));
 | 
						|
	counts.expected_paths = expected_files;
 | 
						|
	counts.expected_statuses = expected_status;
 | 
						|
 | 
						|
	opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
 | 
						|
	cl_assert_equal_i(6, counts.entry_count);
 | 
						|
 | 
						|
	git_repository_free(smrepo);
 | 
						|
}
 | 
						|
 | 
						|
void test_status_submodules__dirty_workdir_only(void)
 | 
						|
{
 | 
						|
	git_status_options opts = GIT_STATUS_OPTIONS_INIT;
 | 
						|
	status_entry_counts counts;
 | 
						|
	static const char *expected_files_with_sub[] = {
 | 
						|
		".gitmodules",
 | 
						|
		"added",
 | 
						|
		"deleted",
 | 
						|
		"ignored",
 | 
						|
		"modified",
 | 
						|
		"testrepo",
 | 
						|
		"untracked"
 | 
						|
	};
 | 
						|
	static unsigned int expected_status_with_sub[] = {
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_INDEX_NEW,
 | 
						|
		GIT_STATUS_INDEX_DELETED,
 | 
						|
		GIT_STATUS_IGNORED,
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_WT_MODIFIED,
 | 
						|
		GIT_STATUS_WT_NEW
 | 
						|
	};
 | 
						|
 | 
						|
	g_repo = setup_fixture_submodules();
 | 
						|
 | 
						|
	cl_git_rewritefile("submodules/testrepo/README", "heyheyhey");
 | 
						|
	cl_git_mkfile("submodules/testrepo/all_new.txt", "never seen before");
 | 
						|
 | 
						|
	/* first do a normal status, which should now include the submodule */
 | 
						|
 | 
						|
	memset(&counts, 0, sizeof(counts));
 | 
						|
	counts.expected_paths = expected_files_with_sub;
 | 
						|
	counts.expected_statuses = expected_status_with_sub;
 | 
						|
 | 
						|
	opts.flags = GIT_STATUS_OPT_DEFAULTS;
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
 | 
						|
	cl_assert_equal_i(7, counts.entry_count);
 | 
						|
 | 
						|
	/* try again with EXCLUDE_SUBMODULES which should skip it */
 | 
						|
 | 
						|
	memset(&counts, 0, sizeof(counts));
 | 
						|
	counts.expected_paths = expected_files;
 | 
						|
	counts.expected_statuses = expected_status;
 | 
						|
 | 
						|
	opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
 | 
						|
 | 
						|
	cl_git_pass(
 | 
						|
		git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
 | 
						|
	cl_assert_equal_i(6, counts.entry_count);
 | 
						|
}
 |