git/convert.c, branch v2.0.2

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05T22:13:21Z

typofix: in-code comments

2013-07-22T23:06:49Z

Signed-off-by: Ondřej Bílka Signed-off-by: Junio C Hamano

Merge branch 'lf/read-blob-data-from-index'

2013-04-22T01:39:45Z

Reduce duplicated code between convert.c and attr.c. * lf/read-blob-data-from-index: convert.c: remove duplicate code read_blob_data_from_index(): optionally return the size of blob data attr.c: extract read_index_data() as read_blob_data_from_index()

convert.c: remove duplicate code

2013-04-17T16:52:33Z

The has_cr_in_index() function is an almost 1:1 copy of read_blob_data_from_index() with some additions. Use the latter instead of using copy-pasted code. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano

convert some config callbacks to parse_config_key

2013-01-23T16:41:50Z

These callers can drop some inline pointer arithmetic and magic offset constants, making them more readable and less error-prone (those constants had to match the lengths of strings, but there is no automatic verification of that fact). The "ep" pointer (presumably for "end pointer"), which points to the final key segment of the config variable, is given the more standard name "key" to describe its function rather than its derivation. Signed-off-by: Jeff King Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'jb/required-filter'

2012-02-28T21:25:57Z

* jb/required-filter: Add a setting to require a filter to be successful Conflicts: convert.c

Merge branch 'jk/maint-avoid-streaming-filtered-contents'

2012-02-27T07:05:38Z

* jk/maint-avoid-streaming-filtered-contents: do not stream large files to pack when filters are in use teach dry-run convert_to_git not to require a src buffer teach convert_to_git a "dry run" mode

teach dry-run convert_to_git not to require a src buffer

2012-02-24T22:12:19Z

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 Signed-off-by: Junio C Hamano

teach convert_to_git a "dry run" mode

2012-02-24T22:11:27Z

Some callers may want to know whether convert_to_git will actually do anything before performing the conversion itself (e.g., to decide whether to stream or handle blobs in-core). This patch lets callers specify the dry run mode by passing a NULL destination buffer. The return value, instead of indicating whether conversion happened, will indicate whether conversion would occur. For readability, we also include a wrapper function which makes it more obvious we are not actually performing the conversion. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Ignore SIGPIPE when running a filter driver

2012-02-21T20:48:09Z

If a filter is not defined or if it fails, git should behave as if the filter is a no-op passthru. However, if the filter exits before reading all the content, depending on the timing, git could be killed with SIGPIPE when it tries to write to the pipe connected to the filter. Ignore SIGPIPE while processing the filter to give us a chance to check the return value from a failed write, in order to detect and act on this mode of failure in a more controlled way. Signed-off-by: Jehan Bing Signed-off-by: Junio C Hamano