kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

convert.c: remove duplicate code 

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 <git@cryptocrack.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Lukas Fleischer 2013-04-13 15:28:32 +02:00 committed by Junio C Hamano
parent ff36682505
commit 4982fd78f6
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
convert.c
View File

@ -153,36 +153,13 @@ static void check_safe_crlf(const char *path, enum crlf_action crlf_action,


static int has_cr_in_index(const char *path) static int has_cr_in_index(const char *path)
{ {
int pos, len;
unsigned long sz; unsigned long sz;
enum object_type type;
void *data; void *data;
int has_cr; int has_cr;
struct index_state *istate = &the_index;


len = strlen(path); data = read_blob_data_from_cache(path, &sz);
pos = index_name_pos(istate, path, len); if (!data)
if (pos < 0) {
/*
* We might be in the middle of a merge, in which
* case we would read stage #2 (ours).
*/
int i;
for (i = -pos - 1;
(pos < 0 && i < istate->cache_nr &&
!strcmp(istate->cache[i]->name, path));
i++)
if (ce_stage(istate->cache[i]) == 2)
pos = i;
}
if (pos < 0)
return 0; return 0;
data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
if (!data || type != OBJ_BLOB) {
free(data);
return 0;
}

has_cr = memchr(data, '\r', sz) != NULL; has_cr = memchr(data, '\r', sz) != NULL;
free(data); free(data);
return has_cr; return has_cr;