Skip to content

fix gitconfig #3018

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
jzbahrai wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix gitconfig #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7d3ebc
fix gitconfig jumana
jzbahrai Aug 20, 2026
9e1c769
fix
jzbahrai Sep 28, 2026
0752fa6
Merge branch 'main' into fix-gitconfig-jumana
jzbahrai Sep 29, 2026
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
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"service": "notify-api",
"workspaceFolder": "/workspace",
"shutdownAction": "stopCompose",
"forwardPorts": [6011],
"remoteEnv": {
"PATH": "/home/vscode/.local/bin:${containerEnv:PATH}" // give our installed Python modules precedence
},
Expand Down
3 changes: 3 additions & 0 deletions .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ services:
REDIS_URL: redis://redis:6380
volumes:
- ..:/workspace:cached
- ${HOME}/.gitconfig:/home/vscode/.gitconfig-host:ro
Comment thread
jzbahrai marked this conversation as resolved.
Comment thread
jzbahrai marked this conversation as resolved.
command: sleep infinity
links:
- db
ports:
- "6011:6011"
expose:
- "6011"
networks:
Expand Down
6 changes: 6 additions & 0 deletions .devcontainer/scripts/notify-dev-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ for attempt in $(seq 1 "$db_upgrade_attempts"); do
fi
done

if [ -f /home/vscode/.gitconfig-host ]; then
if ! git config --global --get-all include.path | grep -Fxq /home/vscode/.gitconfig-host; then
git config --global --add include.path /home/vscode/.gitconfig-host
fi
fi
Comment thread
jzbahrai marked this conversation as resolved.

# Set up git blame to ignore certain revisions e.g. sweeping code formatting changes.
git config blame.ignoreRevsFile .git-blame-ignore-revs

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,5 @@ cypress.env.json
node_modules/
tests_cypress/cypress/videos/
.github/instructions/*
.ruff_cache/
.ruff_cache/
.env/
Loading