undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: remove silly 1024-byte line limit

Browse Source 
Ever since 658f365 (Make git-rerere a builtin, 2006-12-20) rewrote it, it
kept this line-length limit regression, even after we started using strbuf
in the same function in 19b358e (Use strbuf API in buitin-rerere.c,
2007-09-06).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2009-12-25 13:55:29 -08:00
parent 8aa38563b2
commit d58ee6dbf6
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rerere.c
View File

@ -87,12 +87,12 @@ static int handle_file(const char *path,
unsigned char *sha1, const char *output) unsigned char *sha1, const char *output)
{ {
git_SHA_CTX ctx; git_SHA_CTX ctx;
char buf[1024];
int hunk_no = 0; int hunk_no = 0;
enum { enum {
RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL, RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL,
} hunk = RR_CONTEXT; } hunk = RR_CONTEXT;
struct strbuf one = STRBUF_INIT, two = STRBUF_INIT; struct strbuf one = STRBUF_INIT, two = STRBUF_INIT;
struct strbuf buf = STRBUF_INIT;
FILE *f = fopen(path, "r"); FILE *f = fopen(path, "r");
FILE *out = NULL; FILE *out = NULL;
int wrerror = 0; int wrerror = 0;
@ -111,20 +111,20 @@ static int handle_file(const char *path,
if (sha1) if (sha1)
git_SHA1_Init(&ctx); git_SHA1_Init(&ctx);
while (fgets(buf, sizeof(buf), f)) { while (!strbuf_getwholeline(&buf, f, '\n')) {
if (!prefixcmp(buf, "<<<<<<< ")) { if (!prefixcmp(buf.buf, "<<<<<<< ")) {
if (hunk != RR_CONTEXT) if (hunk != RR_CONTEXT)
goto bad; goto bad;
hunk = RR_SIDE_1; hunk = RR_SIDE_1;
} else if (!prefixcmp(buf, "|||||||") && isspace(buf[7])) { } else if (!prefixcmp(buf.buf, "|||||||") && isspace(buf.buf[7])) {
if (hunk != RR_SIDE_1) if (hunk != RR_SIDE_1)
goto bad; goto bad;
hunk = RR_ORIGINAL; hunk = RR_ORIGINAL;
} else if (!prefixcmp(buf, "=======") && isspace(buf[7])) { } else if (!prefixcmp(buf.buf, "=======") && isspace(buf.buf[7])) {
if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL) if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
goto bad; goto bad;
hunk = RR_SIDE_2; hunk = RR_SIDE_2;
} else if (!prefixcmp(buf, ">>>>>>> ")) { } else if (!prefixcmp(buf.buf, ">>>>>>> ")) {
if (hunk != RR_SIDE_2) if (hunk != RR_SIDE_2)
goto bad; goto bad;
if (strbuf_cmp(&one, &two) > 0) if (strbuf_cmp(&one, &two) > 0)
@ -147,13 +147,13 @@ static int handle_file(const char *path,
strbuf_reset(&one); strbuf_reset(&one);
strbuf_reset(&two); strbuf_reset(&two);
} else if (hunk == RR_SIDE_1) } else if (hunk == RR_SIDE_1)
strbuf_addstr(&one, buf); strbuf_addstr(&one, buf.buf);
else if (hunk == RR_ORIGINAL) else if (hunk == RR_ORIGINAL)
; /* discard */ ; /* discard */
else if (hunk == RR_SIDE_2) else if (hunk == RR_SIDE_2)
strbuf_addstr(&two, buf); strbuf_addstr(&two, buf.buf);
else if (out) else if (out)
ferr_puts(buf, out, &wrerror); ferr_puts(buf.buf, out, &wrerror);
continue; continue;
bad: bad:
hunk = 99; /* force error exit */ hunk = 99; /* force error exit */
@ -161,6 +161,7 @@ static int handle_file(const char *path,
} }
strbuf_release(&one); strbuf_release(&one);
strbuf_release(&two); strbuf_release(&two);
strbuf_release(&buf);
fclose(f); fclose(f);
if (wrerror) if (wrerror)