@matheusbsbs / matheus-bagliano / commits / 4c3b57b98b

teach dry-run convert_to_git not to require a src buffer

When we call convert_to_git in dry-run mode, it may still want to look at the source buffer, because some CRLF conversion modes depend on analyzing the source to determine whether it is in fact convertible CRLF text. However, the main motivation for convert_to_git's dry-run mode is that we would decide which method to use to acquire the blob's data (streaming versus in-core). Requiring this source analysis creates a chicken-and-egg problem. We are better off simply guessing that anything we can't analyze will end up needing conversion. This patch lets a caller specify a NULL src buffer when using dry-run mode (and only dry-run mode). A non-zero return value goes from "we would convert" to "we might convert"; a zero return value remains "we would definitely not convert". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 24, 2012 at 17:05 UTC 4c3b57b98bccfdb740b8f1d0ca574dd51deacfad

1 file changed +10 -2

convert.c

+10 -2

@@ -195,9 +195,17 @@ static int crlf_to_git(const char *path, const char *src, size_t len,

195 char *dst;

196

197 if (crlf_action == CRLF_BINARY ||

198 - (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) || !len)

198 + (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) ||

199 + (src && !len))

200 return 0;

201

202 + /*

203 + * If we are doing a dry-run and have no source buffer, there is

204 + * nothing to analyze; we must assume we would convert.

205 + */

206 + if (!buf && !src)

207 + return 1;

208 +

209 gather_stats(src, len, &stats);

210

211 if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) {

@@ -532,7 +540,7 @@ static int ident_to_git(const char *path, const char *src, size_t len,

540 {

541 char *dst, *dollar;

542

535 - if (!ident || !count_ident(src, len))

543 + if (!ident || (src && !count_ident(src, len)))

544 return 0;

545

546 if (!buf)