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 /src/status.c | |
| 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 'src/status.c')
| -rw-r--r-- | src/status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/status.c b/src/status.c index 76ae83138..106e5005d 100644 --- a/src/status.c +++ b/src/status.c @@ -131,7 +131,7 @@ static int status_entry_update_ignore(struct status_entry *e, git_ignores *ignor if ((error = git_ignore__lookup(ignores, path, &ignored)) == GIT_SUCCESS && ignored) e->status_flags = - (e->status_flags & ~GIT_STATUS_WT_NEW) | GIT_STATUS_WT_IGNORED; + (e->status_flags & ~GIT_STATUS_WT_NEW) | GIT_STATUS_IGNORED; return error; } |