thodg/libgit2/tests/checkout/head.c

• Show log

  Commit

• Hash : 0ef405b3
  Author :
  Date : 2017-02-15T14:05:10
  

  checkout: do not delete directories with untracked entries If the `GIT_CHECKOUT_FORCE` flag is given to any of the `git_checkout` invocations, we remove files which were previously staged. But while doing so, we unfortunately also remove unstaged files in a directory which contains at least one staged file, resulting in potential data loss. This commit adds two tests to verify behavior.

Download

• tests/checkout/head.c

• #include "clar_libgit2.h"
  #include "refs.h"
  #include "repo/repo_helpers.h"
  #include "path.h"
  #include "fileops.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_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"));
  }
  

Download