Junio C Hamano  committed e85dc0a

Accept git aliases outside a git repository

af05d67 (Always set *nongit_ok in setup_git_directory_gently(),
2008-03-25) had a change from the patch originally submitted that resulted
in disabling aliases outside a git repository.

It turns out that some people used "alias.fubar = diff --color-words" in
$HOME/.gitconfig to use non-index diff (or any command that do not need
git repository) outside git repositories, and this change broke them,
so this resurrects the support for such usage.

Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits f58dbf2

Comments (0)

Files changed (1)

 	const char** new_argv;
 	const char *alias_command;
 	char *alias_string;
+	int unused_nongit;
-	subdir = setup_git_directory_gently(NULL);
+	subdir = setup_git_directory_gently(&unused_nongit);
 	alias_command = (*argv)[0];
 	alias_string = alias_lookup(alias_command);