From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Feb 2012 21:25:57 +0000 (-0800)
Subject: Merge branch 'jb/required-filter'
X-Git-Tag: v1.7.10-rc0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=524ee675a36961c5b59302e84ffd08808f4f787e;p=thirdparty%2Fgit.git

Merge branch 'jb/required-filter'

* jb/required-filter:
  Add a setting to require a filter to be successful

Conflicts:
	convert.c
---

524ee675a36961c5b59302e84ffd08808f4f787e
diff --cc convert.c
index 4534e2c2b0,c06309f5e1..66021550c3
--- a/convert.c
+++ b/convert.c
@@@ -776,11 -757,16 +783,16 @@@ int convert_to_git(const char *path, co
  	struct conv_attrs ca;
  
  	convert_attrs(&ca, path);
- 	if (ca.drv)
+ 	if (ca.drv) {
  		filter = ca.drv->clean;
+ 		required = ca.drv->required;
+ 	}
  
  	ret |= apply_filter(path, src, len, dst, filter);
+ 	if (!ret && required)
+ 		die("%s: clean filter '%s' failed", path, ca.drv->name);
+ 
 -	if (ret) {
 +	if (ret && dst) {
  		src = dst->buf;
  		len = dst->len;
  	}