Merge branch 'ml/pager' into next

* ml/pager:
  pager: environment variable GIT_PAGER to override PAGER
  pager: config variable pager.color
  Builtins: control the use of pager from the command table.
  Fix up some fallout from "setup_git_directory()" cleanups
  Fix double "close()" in ce_compare_data
This commit is contained in:
Junio C Hamano
2006-07-31 15:52:08 -07:00
11 changed files with 34 additions and 17 deletions

View File

@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
unsigned char sha1[20];
if (!index_fd(sha1, fd, st, 0, NULL))
match = memcmp(sha1, ce->sha1, 20);
close(fd);
/* index_fd() closed the file descriptor already */
}
return match;
}