[snip]

> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index 0c948f40fb..fe873807ed 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -3,7 +3,6 @@
>   *
>   * Copyright (C) Linus Torvalds, 2005
>   */
> -#define USE_THE_INDEX_VARIABLE

Nit: The other changes have a newline after the header.