Skip to content

fix(in): apply git_config locally for persistence across tasks #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(in): apply git_config locally for persistence across tasks #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ configure_git_global() {
jq -r ".[] | \"git config --global '\\(.name)' '\\(.value)'; \"")
}

configure_git_local() {
local git_config_payload="$1"
if [ -n "$git_config_payload" ] && [ "$git_config_payload" != "[]" ]; then
echo "$git_config_payload" | jq -r '.[] | [.name, .value] | @tsv' | \
while IFS=$'\t' read -r name value; do
git config "$name" "$value"
done
fi
}

configure_git_ssl_verification() {
skip_ssl_verification=$(jq -r '.source.skip_ssl_verification // false' <<< "$1")
if [ "$skip_ssl_verification" = "true" ]; then
Expand Down
2 changes: 2 additions & 0 deletions assets/in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ git clone --progress --single-branch $depthflag $uri $branchflag $destination $t

cd $destination

configure_git_local "${git_config_payload}"

if [ "$sparse_paths" != "." ] && [ "$sparse_paths" != "" ]; then
git config core.sparseCheckout true
echo "$sparse_paths" >> ./.git/info/sparse-checkout
Expand Down
34 changes: 34 additions & 0 deletions test/get.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,39 @@ it_can_get_from_url_at_override_branch() {
test "$(git -C $dest rev-parse HEAD)" = $ref
}

it_preserves_git_config_in_local_repository() {
local repo=$(init_repo)
local ref=$(make_commit $repo)
local dest=$TMPDIR/destination

# Save original gitconfig and set up minimal config for the test
cp ~/.gitconfig ~/.gitconfig.bak 2>/dev/null || true
cat > ~/.gitconfig <<EOF
[user]
name = test
email = [email protected]
EOF

get_uri_with_config $repo $dest | jq -e "
.version == {ref: $(echo $ref | jq -R .)}
"

# Verify configs are set in LOCAL repository (not global)
test "$(git -C $dest config --local core.pager)" = "true" || \
( echo "Local git config core.pager not set"; return 1 )
test "$(git -C $dest config --local credential.helper)" = '!true long command with variables $@' || \
( echo "Local git config credential.helper not set"; return 1 )

# Verify they're actually in .git/config file
grep -q "pager = true" $dest/.git/config || \
( echo "core.pager not found in .git/config"; return 1 )
grep -q 'helper = !true long command with variables $@' $dest/.git/config || \
( echo "credential.helper not found in .git/config"; return 1 )

# Restore original gitconfig
mv ~/.gitconfig.bak ~/.gitconfig 2>/dev/null || true
}

it_can_get_from_url_with_sparse_paths() {
local repo=$(init_repo)
local ref1=$(make_commit_to_file $repo file-a)
Expand Down Expand Up @@ -946,6 +979,7 @@ run it_can_get_from_url_at_ref
run it_can_get_from_url_at_branch
run it_can_get_from_url_only_single_branch
run it_can_get_from_url_at_override_branch
run it_preserves_git_config_in_local_repository
run it_can_get_from_url_with_sparse_paths
run it_omits_empty_branch_in_metadata
run it_returns_branch_in_metadata
Expand Down