From 61678d87c2aad3bd668196993d8c32f298ddf5ff Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Apr 2006 01:59:00 -0700 Subject: [PATCH 1/2] diff-index: fix compilation warnings. Signed-off-by: Junio C Hamano --- diff-index.c | 1 - 1 file changed, 1 deletion(-) diff --git a/diff-index.c b/diff-index.c index 86940123b3..8c9f60173b 100644 --- a/diff-index.c +++ b/diff-index.c @@ -11,7 +11,6 @@ COMMON_DIFF_OPTIONS_HELP; int main(int argc, const char **argv) { struct rev_info rev; - int match_missing = 0; int cached = 0; int i; From 83aa18eade572679319406d6dc12a81599a4d57e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 27 Apr 2006 09:02:54 -0700 Subject: [PATCH 2/2] Fix "git help -a" terminal autosizing When I split out the builtin commands into their own files, I left the include of in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- builtin-help.c | 1 + git.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-help.c b/builtin-help.c index 10a59cc403..7470faa566 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -3,6 +3,7 @@ * * Builtin help-related commands (help, usage, version) */ +#include #include "cache.h" #include "builtin.h" #include "exec_cmd.h" diff --git a/git.c b/git.c index aa2b814d93..01b7e28b8c 100644 --- a/git.c +++ b/git.c @@ -8,7 +8,6 @@ #include #include #include -#include #include "git-compat-util.h" #include "exec_cmd.h"