proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 18:52:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3146 from ethomson/add_untracked_files

Browse Source 
index_add_all: include untracked files in new subdirs
This commit is contained in:
Carlos Martín Nieto 2015-05-21 04:58:16 +02:00
commit 6675aaba88
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.c
View File

@ -2683,7 +2683,9 @@ static int index_apply_to_wd_diff(git_index *index, int action, const git_strarr
opts.flags = GIT_DIFF_INCLUDE_TYPECHANGE;
if (action == INDEX_ACTION_ADDALL) {
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_RECURSE_IGNORED_DIRS;
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
GIT_DIFF_RECURSE_UNTRACKED_DIRS;
if (flags == GIT_INDEX_ADD_FORCE)
opts.flags |= GIT_DIFF_INCLUDE_IGNORED;
}

23
tests/index/addall.c
View File

@ -282,6 +282,29 @@ void test_index_addall__repo_lifecycle(void)
git_index_free(index);
}
void test_index_addall__files_in_folders(void)
{
git_index *index;
git_strarray paths = { NULL, 0 };
addall_create_test_repo(true);
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 2, 0, 0, 0, 0, 0, 1);
cl_must_pass(p_mkdir(TEST_DIR "/subdir", 0777));
cl_git_mkfile(TEST_DIR "/subdir/file", "hello!\n");
check_status(g_repo, 2, 0, 0, 1, 0, 0, 1);
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
check_status(g_repo, 3, 0, 0, 0, 0, 0, 1);
git_index_free(index);
}
static int addall_match_prefix(
const char *path, const char *matched_pathspec, void *payload)
{