diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:30:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:30:44 -0700 |
| commit | f7804e250dfceb9695eddc11862054e2f9ca29c7 (patch) | |
| tree | 60139d6075a52c654e16bff1e150b62d56cb5b9d | |
| parent | Merge branch 'dt/tests-with-env-not-subshell' (diff) | |
| parent | fsck: use bitwise-or assignment operator to set flag (diff) | |
| download | tgif-f7804e250dfceb9695eddc11862054e2f9ca29c7.tar.xz | |
Merge branch 'hs/simplify-bit-setting-in-fsck-tree'
* hs/simplify-bit-setting-in-fsck-tree:
fsck: use bitwise-or assignment operator to set flag
| -rw-r--r-- | fsck.c | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -165,18 +165,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) sha1 = tree_entry_extract(&desc, &name, &mode); - if (is_null_sha1(sha1)) - has_null_sha1 = 1; - if (strchr(name, '/')) - has_full_path = 1; - if (!*name) - has_empty_name = 1; - if (!strcmp(name, ".")) - has_dot = 1; - if (!strcmp(name, "..")) - has_dotdot = 1; - if (!strcmp(name, ".git")) - has_dotgit = 1; + has_null_sha1 |= is_null_sha1(sha1); + has_full_path |= !!strchr(name, '/'); + has_empty_name |= !*name; + has_dot |= !strcmp(name, "."); + has_dotdot |= !strcmp(name, ".."); + has_dotgit |= !strcmp(name, ".git"); has_zero_pad |= *(char *)desc.buffer == '0'; update_tree_entry(&desc); |