Revision cad3a2056d2aef3f57c3bb0eccc10614ae69926f authored by Junio C Hamano on 07 August 2007, 04:08:43 UTC, committed by Junio C Hamano on 07 August 2007, 04:10:59 UTC
It was very unfortunate that we added core.pager setting to the configuration file; even when the underlying command does not care if there is no git repository is involved (think "git diff --no-index"), the user would now rightfully want the configuration setting to be honored, which means we would need to read the configuration file before we launch the pager. This is a minimum change in the sense that it restores the old behaviour of not even reading config in setup_git_directory(), but have the core.pager honored when we know it matters. Note that this does not cover "git -p --git-dir where command"; the -p option immediately trigger the pager settings before we even see --git-dir to learn where the configuration file is, so we will end up reading the configuration from the place where we would _normally_ find the git repository. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3f0a8f3
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);
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...