thodg/libgit2/tests/checkout/head.c
Tag
-
Show log
Commit
-
Hash : d62e44cb
Author :
Date : 2019-06-03T18:35:08
checkout: Fix removing untracked files by path in subdirectories The checkout code didn't iterate into a subdir if it didn't match the pathspec, but since the pathspec might match files in the subdir we should recurse into it (In contrast to gitignore handling). Fixes #5089
-
tests/checkout/head.c
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292
#include "clar_libgit2.h" #include "refs.h" #include "repo/repo_helpers.h" #include "path.h" #include "futils.h" static git_repository *g_repo; void test_checkout_head__initialize(void) { g_repo = cl_git_sandbox_init("testrepo"); } void test_checkout_head__cleanup(void) { cl_git_sandbox_cleanup(); } void test_checkout_head__unborn_head_returns_GIT_EUNBORNBRANCH(void) { make_head_unborn(g_repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EUNBORNBRANCH, git_checkout_head(g_repo, NULL)); } void test_checkout_head__with_index_only_tree(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_index *index; /* let's start by getting things into a known state */ opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_checkout_head(g_repo, &opts)); /* now let's stage some new stuff including a new directory */ cl_git_pass(git_repository_index(&index, g_repo)); p_mkdir("testrepo/newdir", 0777); cl_git_mkfile("testrepo/newdir/newfile.txt", "new file\n"); cl_git_pass(git_index_add_bypath(index, "newdir/newfile.txt")); cl_git_pass(git_index_write(index)); cl_assert(git_path_isfile("testrepo/newdir/newfile.txt")); cl_assert(git_index_get_bypath(index, "newdir/newfile.txt", 0) != NULL); git_index_free(index); /* okay, so now we have staged this new file; let's see if we can remove */ opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; cl_git_pass(git_checkout_head(g_repo, &opts)); cl_git_pass(git_repository_index(&index, g_repo)); cl_assert(!git_path_isfile("testrepo/newdir/newfile.txt")); cl_assert(git_index_get_bypath(index, "newdir/newfile.txt", 0) == NULL); git_index_free(index); } void test_checkout_head__do_not_remove_untracked_file(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_index *index; cl_git_pass(p_mkdir("testrepo/tracked", 0755)); cl_git_mkfile("testrepo/tracked/tracked", "tracked\n"); cl_git_mkfile("testrepo/tracked/untracked", "untracked\n"); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_add_bypath(index, "tracked/tracked")); cl_git_pass(git_index_write(index)); git_index_free(index); opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_checkout_head(g_repo, &opts)); cl_assert(!git_path_isfile("testrepo/tracked/tracked")); cl_assert(git_path_isfile("testrepo/tracked/untracked")); } void test_checkout_head__do_not_remove_untracked_file_in_subdir(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_index *index; cl_git_pass(p_mkdir("testrepo/tracked", 0755)); cl_git_pass(p_mkdir("testrepo/tracked/subdir", 0755)); cl_git_mkfile("testrepo/tracked/tracked", "tracked\n"); cl_git_mkfile("testrepo/tracked/subdir/tracked", "tracked\n"); cl_git_mkfile("testrepo/tracked/subdir/untracked", "untracked\n"); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_add_bypath(index, "tracked/tracked")); cl_git_pass(git_index_add_bypath(index, "tracked/subdir/tracked")); cl_git_pass(git_index_write(index)); git_index_free(index); opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_checkout_head(g_repo, &opts)); cl_assert(!git_path_isfile("testrepo/tracked/tracked")); cl_assert(!git_path_isfile("testrepo/tracked/subdir/tracked")); cl_assert(git_path_isfile("testrepo/tracked/subdir/untracked")); } void test_checkout_head__do_remove_untracked_paths(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_index *index; char *paths[] = {"tracked/untracked"}; cl_git_pass(p_mkdir("testrepo/tracked", 0755)); cl_git_pass(p_mkdir("testrepo/tracked/subdir", 0755)); cl_git_mkfile("testrepo/tracked/tracked", "tracked\n"); cl_git_mkfile("testrepo/tracked/untracked", "untracked\n"); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_add_bypath(index, "tracked/tracked")); cl_git_pass(git_index_write(index)); git_index_free(index); opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; opts.paths.strings = paths; opts.paths.count = 1; cl_git_pass(git_checkout_head(g_repo, &opts)); cl_assert(git_path_isfile("testrepo/tracked/tracked")); cl_assert(!git_path_isfile("testrepo/tracked/untracked")); } void test_checkout_head__do_remove_tracked_subdir(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_index *index; cl_git_pass(p_mkdir("testrepo/subdir", 0755)); cl_git_pass(p_mkdir("testrepo/subdir/tracked", 0755)); cl_git_mkfile("testrepo/subdir/tracked-file", "tracked\n"); cl_git_mkfile("testrepo/subdir/untracked-file", "untracked\n"); cl_git_mkfile("testrepo/subdir/tracked/tracked1", "tracked\n"); cl_git_mkfile("testrepo/subdir/tracked/tracked2", "tracked\n"); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_add_bypath(index, "subdir/tracked-file")); cl_git_pass(git_index_add_bypath(index, "subdir/tracked/tracked1")); cl_git_pass(git_index_add_bypath(index, "subdir/tracked/tracked2")); cl_git_pass(git_index_write(index)); git_index_free(index); opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_checkout_head(g_repo, &opts)); cl_assert(!git_path_isdir("testrepo/subdir/tracked")); cl_assert(!git_path_isfile("testrepo/subdir/tracked-file")); cl_assert(git_path_isfile("testrepo/subdir/untracked-file")); } void test_checkout_head__typechange_workdir(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_object *target; struct stat st; opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_revparse_single(&target, g_repo, "HEAD")); cl_git_pass(git_reset(g_repo, target, GIT_RESET_HARD, NULL)); cl_must_pass(p_chmod("testrepo/new.txt", 0755)); cl_git_pass(git_checkout_head(g_repo, &opts)); cl_git_pass(p_stat("testrepo/new.txt", &st)); cl_assert(!GIT_PERMS_IS_EXEC(st.st_mode)); git_object_free(target); } void test_checkout_head__typechange_index_and_workdir(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_object *target; git_index *index; struct stat st; opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_revparse_single(&target, g_repo, "HEAD")); cl_git_pass(git_reset(g_repo, target, GIT_RESET_HARD, NULL)); cl_must_pass(p_chmod("testrepo/new.txt", 0755)); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_add_bypath(index, "new.txt")); cl_git_pass(git_index_write(index)); cl_git_pass(git_checkout_head(g_repo, &opts)); cl_git_pass(p_stat("testrepo/new.txt", &st)); cl_assert(!GIT_PERMS_IS_EXEC(st.st_mode)); git_object_free(target); git_index_free(index); } void test_checkout_head__workdir_filemode_is_simplified(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_object *target, *branch; opts.checkout_strategy = GIT_CHECKOUT_FORCE; cl_git_pass(git_revparse_single(&target, g_repo, "a38d028f71eaa590febb7d716b1ca32350cf70da")); cl_git_pass(git_reset(g_repo, target, GIT_RESET_HARD, NULL)); cl_must_pass(p_chmod("testrepo/branch_file.txt", 0666)); /* * Checkout should not fail with a conflict; though the file mode * on disk is literally different to the base (0666 vs 0644), Git * ignores the actual mode and simply treats both as non-executable. */ cl_git_pass(git_revparse_single(&branch, g_repo, "099fabac3a9ea935598528c27f866e34089c2eff")); opts.checkout_strategy &= ~GIT_CHECKOUT_FORCE; opts.checkout_strategy |= GIT_CHECKOUT_SAFE; cl_git_pass(git_checkout_tree(g_repo, branch, NULL)); git_object_free(branch); git_object_free(target); } void test_checkout_head__obeys_filemode_true(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_object *target, *branch; opts.checkout_strategy = GIT_CHECKOUT_FORCE; /* In this commit, `README` is executable */ cl_git_pass(git_revparse_single(&target, g_repo, "f9ed4af42472941da45a3c")); cl_git_pass(git_reset(g_repo, target, GIT_RESET_HARD, NULL)); cl_repo_set_bool(g_repo, "core.filemode", true); cl_must_pass(p_chmod("testrepo/README", 0644)); /* * Checkout will fail with a conflict; the file mode is updated in * the checkout target, but the contents have changed in our branch. */ cl_git_pass(git_revparse_single(&branch, g_repo, "099fabac3a9ea935598528c27f866e34089c2eff")); opts.checkout_strategy &= ~GIT_CHECKOUT_FORCE; opts.checkout_strategy |= GIT_CHECKOUT_SAFE; cl_git_fail_with(GIT_ECONFLICT, git_checkout_tree(g_repo, branch, NULL)); git_object_free(branch); git_object_free(target); } void test_checkout_head__obeys_filemode_false(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_object *target, *branch; opts.checkout_strategy = GIT_CHECKOUT_FORCE; /* In this commit, `README` is executable */ cl_git_pass(git_revparse_single(&target, g_repo, "f9ed4af42472941da45a3c")); cl_git_pass(git_reset(g_repo, target, GIT_RESET_HARD, NULL)); cl_repo_set_bool(g_repo, "core.filemode", false); cl_must_pass(p_chmod("testrepo/README", 0644)); /* * Checkout will fail with a conflict; the file contents are updated * in the checkout target, but the filemode has changed in our branch. */ cl_git_pass(git_revparse_single(&branch, g_repo, "099fabac3a9ea935598528c27f866e34089c2eff")); opts.checkout_strategy &= ~GIT_CHECKOUT_FORCE; opts.checkout_strategy |= GIT_CHECKOUT_SAFE; cl_git_pass(git_checkout_tree(g_repo, branch, NULL)); git_object_free(branch); git_object_free(target); }