Merge branch 'jk/rebase-i-exec-gitdir-fix'

A recent regression in "git rebase -i" that broke execution of git
commands from subdirectories via "exec" insn has been fixed.

* jk/rebase-i-exec-gitdir-fix:
  sequencer: pass absolute GIT_DIR to exec commands
This commit is contained in:
Junio C Hamano 2017-11-06 13:11:28 +09:00
Родитель 662ac3b3a8 09d7b6c6fa
Коммит e4db47e6a0
2 изменённых файлов: 17 добавлений и 1 удалений

Просмотреть файл

@ -1861,12 +1861,15 @@ static int error_failed_squash(struct commit *commit,
static int do_exec(const char *command_line)
{
struct argv_array child_env = ARGV_ARRAY_INIT;
const char *child_argv[] = { NULL, NULL };
int dirty, status;
fprintf(stderr, "Executing: %s\n", command_line);
child_argv[0] = command_line;
status = run_command_v_opt(child_argv, RUN_USING_SHELL);
argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
child_env.argv);
/* force re-reading of the cache */
if (discard_cache() < 0 || read_cache() < 0)
@ -1896,6 +1899,8 @@ static int do_exec(const char *command_line)
status = 1;
}
argv_array_clear(&child_env);
return status;
}

Просмотреть файл

@ -108,6 +108,17 @@ test_expect_success 'rebase -i with the exec command runs from tree root' '
rm -fr subdir
'
test_expect_success 'rebase -i with exec allows git commands in subdirs' '
test_when_finished "rm -rf subdir" &&
test_when_finished "git rebase --abort ||:" &&
git checkout master &&
mkdir subdir && (cd subdir &&
set_fake_editor &&
FAKE_LINES="1 exec_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
git rebase -i HEAD^
)
'
test_expect_success 'rebase -i with the exec command checks tree cleanness' '
git checkout master &&
set_fake_editor &&