mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'da/git-prefix-everywhere' into next

Browse Source 
* da/git-prefix-everywhere:
  t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
  git-mergetool--lib: Make vimdiff retain the current directory
  git: Remove handling for GIT_PREFIX
  setup: Provide GIT_PREFIX to built-ins
This commit is contained in:
Junio C Hamano
2011-06-29 17:09:27 -07:00
parent 55ac692661 c35ec8c901
commit 4ed54610e5
5 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git.c
View File

@ -183,8 +183,6 @@ static int handle_alias(int *argcp, const char ***argv)
if (alias_string[0] == '!') {
const char **alias_argv;
int argc = *argcp, i;
struct strbuf sb = STRBUF_INIT;
const char *env[2];
commit_pager_choice();
@ -195,13 +193,7 @@ static int handle_alias(int *argcp, const char ***argv)
alias_argv[i] = (*argv)[i];
alias_argv[argc] = NULL;
strbuf_addstr(&sb, "GIT_PREFIX=");
if (subdir)
strbuf_addstr(&sb, subdir);
env[0] = sb.buf;
env[1] = NULL;
ret = run_command_v_opt_cd_env(alias_argv, RUN_USING_SHELL, NULL, env);
strbuf_release(&sb);
ret = run_command_v_opt(alias_argv, RUN_USING_SHELL);
if (ret >= 0) /* normal exit */
exit(ret);