diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:54 +0300 |
| commit | 761868b693e2c034148c32bb7fba182a0b381d44 (patch) | |
| tree | 29acde6265f2848466f136d55aa92af90a704f85 /builtin | |
| parent | 04b9bdbe163f891852775af8cd97434fd828902e (diff) | |
| parent | d64324cb60e4d0e1f5fdc1d3319c79ddbf5d0eb2 (diff) | |
Merge branch 'tb/void-check-attr' into maint
Code clean-up.
* tb/void-check-attr:
Make git_check_attr() a void function
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/check-attr.c | 3 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c index c05573ff9c..30a2f84274 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -65,8 +65,7 @@ static void check_attr(const char *prefix, if (collect_all) { git_all_attrs(&the_index, full_path, check); } else { - if (git_check_attr(&the_index, full_path, check)) - die("git_check_attr died"); + git_check_attr(&the_index, full_path, check); } output_attr(check, file); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ad3c650c08..2eba0a695b 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -951,8 +951,7 @@ static int no_try_delta(const char *path) if (!check) check = attr_check_initl("delta", NULL); - if (git_check_attr(&the_index, path, check)) - return 0; + git_check_attr(&the_index, path, check); if (ATTR_FALSE(check->items[0].value)) return 1; return 0; |