diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:45 -0700 |
| commit | 10de0f802db2d1ca6a157a7fe3eedb63191e4af5 (patch) | |
| tree | b0b0807cbbdf0c0545e21d413529f51e5fc15d36 /builtin | |
| parent | 87ae8a1a950da28a2f75570ecaecbc9cd439c64c (diff) | |
| parent | d64324cb60e4d0e1f5fdc1d3319c79ddbf5d0eb2 (diff) | |
| download | git-10de0f802db2d1ca6a157a7fe3eedb63191e4af5.tar.gz | |
Merge branch 'tb/void-check-attr'
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 5041818ddf..e6316d294d 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -970,8 +970,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; |