Commit 8371457c by Edward Thomson

Merge pull request #2597 from ethomson/fixup

Trivial fixups
parents eecc1772 7c9bf891
...@@ -1567,8 +1567,10 @@ int git_repository_head_unborn(git_repository *repo) ...@@ -1567,8 +1567,10 @@ int git_repository_head_unborn(git_repository *repo)
error = git_repository_head(&ref, repo); error = git_repository_head(&ref, repo);
git_reference_free(ref); git_reference_free(ref);
if (error == GIT_EUNBORNBRANCH) if (error == GIT_EUNBORNBRANCH) {
giterr_clear();
return 1; return 1;
}
if (error < 0) if (error < 0)
return -1; return -1;
......
...@@ -370,8 +370,8 @@ void test_stash_save__including_untracked_without_any_untracked_file_creates_an_ ...@@ -370,8 +370,8 @@ void test_stash_save__including_untracked_without_any_untracked_file_creates_an_
void test_stash_save__ignored_directory(void) void test_stash_save__ignored_directory(void)
{ {
cl_git_pass(mkdir("stash/ignored_directory", 0777)); cl_git_pass(p_mkdir("stash/ignored_directory", 0777));
cl_git_pass(mkdir("stash/ignored_directory/sub", 0777)); cl_git_pass(p_mkdir("stash/ignored_directory/sub", 0777));
cl_git_mkfile("stash/ignored_directory/sub/some_file", "stuff"); cl_git_mkfile("stash/ignored_directory/sub/some_file", "stuff");
assert_status(repo, "ignored_directory/sub/some_file", GIT_STATUS_WT_NEW); assert_status(repo, "ignored_directory/sub/some_file", GIT_STATUS_WT_NEW);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment