summaryrefslogtreecommitdiff
path: root/tests-clar/reset/hard.c
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2013-05-13 21:57:37 +0200
committernulltoken <emeric.fermas@gmail.com>2013-05-15 22:41:30 +0200
commit1fed6b07f0722c8b4349ff3709a49df3d3c9ae61 (patch)
tree2c1b791be59a061bebab3392575a0b90dc323b23 /tests-clar/reset/hard.c
parentf0ab73720a4e7a9b37c901a27519ea65eafeb8a6 (diff)
downloadlibgit2-1fed6b07f0722c8b4349ff3709a49df3d3c9ae61.tar.gz
Fix trailing whitespaces
Diffstat (limited to 'tests-clar/reset/hard.c')
-rw-r--r--tests-clar/reset/hard.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/tests-clar/reset/hard.c b/tests-clar/reset/hard.c
index 62371f83f..1c0c84135 100644
--- a/tests-clar/reset/hard.c
+++ b/tests-clar/reset/hard.c
@@ -105,14 +105,14 @@ void test_reset_hard__cannot_reset_in_a_bare_repository(void)
static void index_entry_init(git_index *index, int side, git_oid *oid)
{
git_index_entry entry;
-
+
memset(&entry, 0x0, sizeof(git_index_entry));
-
+
entry.path = "conflicting_file";
entry.flags = (side << GIT_IDXENTRY_STAGESHIFT);
entry.mode = 0100644;
git_oid_cpy(&entry.oid, oid);
-
+
cl_git_pass(git_index_add(index, &entry));
}
@@ -122,19 +122,19 @@ static void unmerged_index_init(git_index *index, int entries)
int write_ours = 2;
int write_theirs = 4;
git_oid ancestor, ours, theirs;
-
+
git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b");
git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2");
git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd");
-
+
cl_git_rewritefile("status/conflicting_file", "conflicting file\n");
-
+
if (entries & write_ancestor)
index_entry_init(index, 1, &ancestor);
-
+
if (entries & write_ours)
index_entry_init(index, 2, &ours);
-
+
if (entries & write_theirs)
index_entry_init(index, 3, &theirs);
}
@@ -143,24 +143,24 @@ void test_reset_hard__resetting_reverts_unmerged(void)
{
git_index *index;
int entries;
-
+
/* Ensure every permutation of non-zero stage entries results in the
* path being cleaned up. */
for (entries = 1; entries < 8; entries++) {
cl_git_pass(git_repository_index(&index, repo));
-
+
unmerged_index_init(index, entries);
cl_git_pass(git_index_write(index));
-
+
retrieve_target_from_oid(&target, repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f");
cl_git_pass(git_reset(repo, target, GIT_RESET_HARD));
-
+
cl_assert(git_path_exists("status/conflicting_file") == 0);
-
+
git_object_free(target);
target = NULL;
-
- git_index_free(index);
+
+ git_index_free(index);
}
}