git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-25 19:43:19 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

setup: fix safe.directory key not being checked

Browse Source 
It seems that nothing is ever checking to make sure the safe directories
in the configs actually have the key safe.directory, so some unrelated
config that has a value with a certain directory would also make it a
safe directory.

Signed-off-by: Matheus Valadares <me@m28.io>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
This commit is contained in:
Matheus Valadares
2022-04-12 19:39:33 -07:00
committed by Derrick Stolee
parent 1bdb9e35c0
commit 5d60f3c4e1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup.c
View File

@@ -1100,6 +1100,9 @@ static int safe_directory_cb(const char *key, const char *value, void *d)
{
struct safe_directory_data *data = d;
if (strcmp(key, "safe.directory"))
return 0;
if (!value || !*value)
data->is_safe = 0;
else {

5
t/t0033-safe-directory.sh
View File

@@ -21,6 +21,11 @@ test_expect_success 'safe.directory does not match' '
expect_rejected_dir
'
test_expect_success 'path exist as different key' '
git config --global foo.bar "$(pwd)" &&
expect_rejected_dir
'
test_expect_success 'safe.directory matches' '
git config --global --add safe.directory "$(pwd)" &&
git status