Revision 4fc970c43884e6215c13d6944a2def1eb2134ed5 authored by Junio C Hamano on 26 February 2007, 06:24:47 UTC, committed by Junio C Hamano on 26 February 2007, 06:25:30 UTC
"git-diff-files --cc" to show conflicts during merge did not pass the correct mode information for the working tree down, and showed bogus combined diff. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 0b1f647
strbuf.c
#include "cache.h"
#include "strbuf.h"
void strbuf_init(struct strbuf *sb) {
sb->buf = NULL;
sb->eof = sb->alloc = sb->len = 0;
}
static void strbuf_begin(struct strbuf *sb) {
free(sb->buf);
strbuf_init(sb);
}
static void inline strbuf_add(struct strbuf *sb, int ch) {
if (sb->alloc <= sb->len) {
sb->alloc = sb->alloc * 3 / 2 + 16;
sb->buf = xrealloc(sb->buf, sb->alloc);
}
sb->buf[sb->len++] = ch;
}
static void strbuf_end(struct strbuf *sb) {
strbuf_add(sb, 0);
}
void read_line(struct strbuf *sb, FILE *fp, int term) {
int ch;
strbuf_begin(sb);
if (feof(fp)) {
sb->eof = 1;
return;
}
while ((ch = fgetc(fp)) != EOF) {
if (ch == term)
break;
strbuf_add(sb, ch);
}
if (ch == EOF && sb->len == 0)
sb->eof = 1;
strbuf_end(sb);
}
Computing file changes ...
