summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-03-22 14:00:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-22 14:00:22 -0700
commit2435feaa207eb3256dda978654b2a4308cdbd446 (patch)
tree136a6179216f388ce66a9c85145c620a6bda0231 /convert.c
parentMerge branch 'jk/open-dotgitx-with-nofollow' (diff)
parentconvert: fail gracefully upon missing clean cmd on required filter (diff)
downloadtgif-2435feaa207eb3256dda978654b2a4308cdbd446.tar.xz
Merge branch 'mt/cleanly-die-upon-missing-required-filter'
We had a code to diagnose and die cleanly when a required clean/smudge filter is missing, but an assert before that unnecessarily fired, hiding the end-user facing die() message. * mt/cleanly-die-upon-missing-required-filter: convert: fail gracefully upon missing clean cmd on required filter
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/convert.c b/convert.c
index 9ecc1c699c..2d3a5a713c 100644
--- a/convert.c
+++ b/convert.c
@@ -1456,7 +1456,6 @@ void convert_to_git_filter_fd(const struct index_state *istate,
convert_attrs(istate, &ca, path);
assert(ca.drv);
- assert(ca.drv->clean || ca.drv->process);
if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL, NULL))
die(_("%s: clean filter '%s' failed"), path, ca.drv->name);