diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-03-01 11:45:00 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:51:55 -0800 |
| commit | e1bcc19110eb7d540dee92af489440dd2953b5d5 (patch) | |
| tree | eb5a3a1db6a7dbdd135faa9845a83c222d2790a1 /tests-clar | |
| parent | c19bc93cef62cf4a638ab42ba9562885b07a68ce (diff) | |
| download | libgit2-e1bcc19110eb7d540dee92af489440dd2953b5d5.tar.gz | |
Revert GIT_STATUS constants to avoid issues
This reverts the changes to the GIT_STATUS constants and adds a
new enumeration to describe the type of change in a git_diff_delta.
I don't love this solution, but it should prevent strange errors
from occurring for now. Eventually, I would like to unify the
various status constants, but it needs a larger plan and I just
wanted to eliminate this breakage quickly.
Diffstat (limited to 'tests-clar')
| -rw-r--r-- | tests-clar/diff/diff_helpers.c | 10 | ||||
| -rw-r--r-- | tests-clar/status/status_data.h | 2 | ||||
| -rw-r--r-- | tests-clar/status/worktree.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 67a4f1c51..d8eca7d9b 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -30,11 +30,11 @@ int diff_file_fn( (void)progress; e->files++; switch (delta->status) { - case GIT_STATUS_ADDED: e->file_adds++; break; - case GIT_STATUS_DELETED: e->file_dels++; break; - case GIT_STATUS_MODIFIED: e->file_mods++; break; - case GIT_STATUS_IGNORED: e->file_ignored++; break; - case GIT_STATUS_UNTRACKED: e->file_untracked++; break; + case GIT_DELTA_ADDED: e->file_adds++; break; + case GIT_DELTA_DELETED: e->file_dels++; break; + case GIT_DELTA_MODIFIED: e->file_mods++; break; + case GIT_DELTA_IGNORED: e->file_ignored++; break; + case GIT_DELTA_UNTRACKED: e->file_untracked++; break; default: break; } return 0; diff --git a/tests-clar/status/status_data.h b/tests-clar/status/status_data.h index 719d841f6..1a68648f4 100644 --- a/tests-clar/status/status_data.h +++ b/tests-clar/status/status_data.h @@ -29,7 +29,7 @@ static const char *entry_paths0[] = { static const unsigned int entry_statuses0[] = { GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_IGNORED, + GIT_STATUS_IGNORED, GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_NEW, GIT_STATUS_INDEX_MODIFIED, diff --git a/tests-clar/status/worktree.c b/tests-clar/status/worktree.c index f654b8a94..132ec1fc1 100644 --- a/tests-clar/status/worktree.c +++ b/tests-clar/status/worktree.c @@ -120,7 +120,7 @@ void test_status_worktree__ignores(void) cl_git_pass( git_status_should_ignore(repo, entry_paths0[i], &ignored) ); - cl_assert(ignored == (entry_statuses0[i] == GIT_STATUS_WT_IGNORED)); + cl_assert(ignored == (entry_statuses0[i] == GIT_STATUS_IGNORED)); } cl_git_pass( |