[PATCH] rebase: exec leaks GIT_DIR to environment
- From
Jacob Keller <jacob.e.keller@intel.com>
- Date
- Oct 28, 2017, 00:01 UTC
- Message-ID
- <20171028000152.2760-1-jacob.e.keller@intel.com>
From: Jacob Keller <jacob.keller@gmail.com>
I noticed a failure with git rebase interactive mode which causes "exec" commands to be run with GIT_DIR set. When GIT_DIR is in the environment, then any command which results in running a git command in a subdirectory will fail because GIT_DIR=".git".
This unfortunately breaks one of my project's Makefiles, which uses git-describe to find the version information, but does so from within a sub directory.
I'm in the process of running a bisect to find where this got introduced, but I suspect it's part of the rebase--helper changes that happened a while ago.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com> --- t/t3404-rebase-interactive.sh | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3704dbb2ecf6..60ab5136f702 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -108,6 +108,17 @@ test_expect_success 'rebase -i with the exec command runs from tree root' ' rm -fr subdir ' +test_expect_failure 'rebase -i with the exec git commands in subdirs still work' ' + test_when_finished "rm -ff 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 &&
-- 2.11.1.4.gad8c7cd