Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-23 00:00:22 +0300
committerJunio C Hamano <gitster@pobox.com>2021-03-23 00:00:22 +0300
commit2435feaa207eb3256dda978654b2a4308cdbd446 (patch)
tree136a6179216f388ce66a9c85145c620a6bda0231 /convert.c
parent204333b015a663a339c855c72b86034203b66a6a (diff)
parent6fab35f748651c408cf300d871d24c920108d94f (diff)
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);