mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-03 11:01:01 +00:00
a6a82e1a59
Stash was sometimes obscuring the actual error code, replacing it with a -1 when there was more descriptive value. This updates stash to preserve the original error code more reliably along with a variety of other error handling tweaks. I believe this is an improvement, but arguably, preserving the underlying error code may result in values that are harder to interpret by the caller who does not understand the internals. Discussion is welcome!
125 lines
2.5 KiB
C
125 lines
2.5 KiB
C
#include "clar_libgit2.h"
|
|
#include "fileops.h"
|
|
#include "stash_helpers.h"
|
|
|
|
struct callback_data
|
|
{
|
|
char **oids;
|
|
int invokes;
|
|
};
|
|
|
|
static git_repository *repo;
|
|
static git_signature *signature;
|
|
static git_oid stash_tip_oid;
|
|
struct callback_data data;
|
|
|
|
#define REPO_NAME "stash"
|
|
|
|
void test_stash_foreach__initialize(void)
|
|
{
|
|
cl_git_pass(git_signature_new(
|
|
&signature,
|
|
"nulltoken",
|
|
"emeric.fermas@gmail.com",
|
|
1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */
|
|
|
|
memset(&data, 0, sizeof(struct callback_data));
|
|
}
|
|
|
|
void test_stash_foreach__cleanup(void)
|
|
{
|
|
git_signature_free(signature);
|
|
signature = NULL;
|
|
|
|
git_repository_free(repo);
|
|
repo = NULL;
|
|
|
|
cl_git_pass(git_futils_rmdir_r(REPO_NAME, NULL, GIT_RMDIR_REMOVE_FILES));
|
|
}
|
|
|
|
static int callback_cb(
|
|
size_t index,
|
|
const char* message,
|
|
const git_oid *stash_oid,
|
|
void *payload)
|
|
{
|
|
struct callback_data *data = (struct callback_data *)payload;
|
|
|
|
GIT_UNUSED(index);
|
|
GIT_UNUSED(message);
|
|
|
|
cl_assert_equal_i(0, git_oid_streq(stash_oid, data->oids[data->invokes++]));
|
|
|
|
return 0;
|
|
}
|
|
|
|
void test_stash_foreach__enumerating_a_empty_repository_doesnt_fail(void)
|
|
{
|
|
char *oids[] = { NULL };
|
|
|
|
data.oids = oids;
|
|
|
|
cl_git_pass(git_repository_init(&repo, REPO_NAME, 0));
|
|
|
|
cl_git_pass(git_stash_foreach(repo, callback_cb, &data));
|
|
|
|
cl_assert_equal_i(0, data.invokes);
|
|
}
|
|
|
|
void test_stash_foreach__can_enumerate_a_repository(void)
|
|
{
|
|
char *oids_default[] = {
|
|
"1d91c842a7cdfc25872b3a763e5c31add8816c25", NULL };
|
|
|
|
char *oids_untracked[] = {
|
|
"7f89a8b15c878809c5c54d1ff8f8c9674154017b",
|
|
"1d91c842a7cdfc25872b3a763e5c31add8816c25", NULL };
|
|
|
|
char *oids_ignored[] = {
|
|
"c95599a8fef20a7e57582c6727b1a0d02e0a5828",
|
|
"7f89a8b15c878809c5c54d1ff8f8c9674154017b",
|
|
"1d91c842a7cdfc25872b3a763e5c31add8816c25", NULL };
|
|
|
|
cl_git_pass(git_repository_init(&repo, REPO_NAME, 0));
|
|
|
|
setup_stash(repo, signature);
|
|
|
|
cl_git_pass(git_stash_save(
|
|
&stash_tip_oid,
|
|
repo,
|
|
signature,
|
|
NULL,
|
|
GIT_STASH_DEFAULT));
|
|
|
|
data.oids = oids_default;
|
|
|
|
cl_git_pass(git_stash_foreach(repo, callback_cb, &data));
|
|
cl_assert_equal_i(1, data.invokes);
|
|
|
|
data.oids = oids_untracked;
|
|
data.invokes = 0;
|
|
|
|
cl_git_pass(git_stash_save(
|
|
&stash_tip_oid,
|
|
repo,
|
|
signature,
|
|
NULL,
|
|
GIT_STASH_INCLUDE_UNTRACKED));
|
|
|
|
cl_git_pass(git_stash_foreach(repo, callback_cb, &data));
|
|
cl_assert_equal_i(2, data.invokes);
|
|
|
|
data.oids = oids_ignored;
|
|
data.invokes = 0;
|
|
|
|
cl_git_pass(git_stash_save(
|
|
&stash_tip_oid,
|
|
repo,
|
|
signature,
|
|
NULL,
|
|
GIT_STASH_INCLUDE_IGNORED));
|
|
|
|
cl_git_pass(git_stash_foreach(repo, callback_cb, &data));
|
|
cl_assert_equal_i(3, data.invokes);
|
|
}
|