Closed psclkhoury closed 1 year ago
Hi @psclkhoury,
Thanks for reaching out and sorry to hear you're seeing this issue.
Password caching is typically the responsibility of the credential manager configured in the .gitconfig
. This will depend on what platform you're on. Could you confirm what operating system you're running (e.g. Windows, Linux, MacOS)?
Additionally, could you please share your Sublime Merge debug information: Debug Information The Sublime Merge debug information can be used to narrow down the cause of an issue. It can be collected with the following steps:
Help > Debug Information
via the application menuThanks, - Dylan
I am running MacOs and this is the Debug info:
=== App Version Information ===
Build: 2083
=== Git Version Information ===
Using Git: git (system)
git version 2.39.2 (Apple Git-143)
PATH: /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/share/dotnet:~/.dotnet/tools:/Library/Apple/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin (from shell)
environment variables loaded using: /bin/zsh -l
=== Browse Page Information ===
HEAD: 5c651199b1f658d395349de6522980c065014bae
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0
=== Git Status Information ===
=== Our Status Information ===
=== Git Config Information ===
branch.master.merge=refs/heads/master
branch.master.remote=origin
commit.template=/Users/myusername/.stCommitMsg
core.bare=false
core.editor=code --wait --new-window
core.excludesfile=/Users/myusername/.gitignore_global
core.filemode=true
core.ignorecase=true
core.logallrefupdates=true
core.precomposeunicode=true
core.repositoryformatversion=0
credential.helper=osxkeychain
diff.tool=kdiff3
difftool.kdiff3.path=/Applications/kdiff3.app/Contents/MacOS/kdiff3
difftool.sourcetree.cmd=opendiff "$LOCAL" "$REMOTE"
difftool.sourcetree.path=
includeif.gitdir:~/workspace/src/gitlab.com/my_company/.path=~/.my_company.gitconfig
init.defaultbranch=main
merge.ff=false
merge.tool=kdiff3
mergetool.kdiff3.path=/Applications/kdiff3.app/Contents/MacOS/kdiff3
mergetool.keepbackup=false
mergetool.keeptemporaries=false
mergetool.prompt=false
mergetool.sourcetree.cmd=/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"
mergetool.sourcetree.trustexitcode=true
pull.ff=only
push.autosetupremote=true
push.default=upstream
push.followtags=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=https://github.com/Username/MyRepo.git
user.email=my_company_username@work.com
user.name=My Name
=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /Users/myusername/.config/git/config
Using config path: /Users/myusername/.gitconfig
Using config path: /Users/myusername/Repos/MyRepo/.git/config
Our config output is different to the Git config output
branch.master.merge=refs/heads/master
branch.master.remote=origin
commit.template=/Users/myusername/.stCommitMsg
core.bare=false
core.editor=code --wait --new-window
core.excludesfile=/Users/myusername/.gitignore_global
core.filemode=true
core.ignorecase=true
core.logallrefupdates=true
core.precomposeunicode=true
core.repositoryformatversion=0
diff.tool=kdiff3
difftool.kdiff3.path=/Applications/kdiff3.app/Contents/MacOS/kdiff3
difftool.sourcetree.cmd=opendiff "$LOCAL" "$REMOTE"
difftool.sourcetree.path=
includeif.gitdir:~/workspace/src/gitlab.com/my_company/.path=~/.my_company.gitconfig
merge.ff=false
merge.tool=kdiff3
mergetool.kdiff3.path=/Applications/kdiff3.app/Contents/MacOS/kdiff3
mergetool.keepbackup=false
mergetool.keeptemporaries=false
mergetool.prompt=false
mergetool.sourcetree.cmd=/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"
mergetool.sourcetree.trustexitcode=true
pull.ff=only
push.autosetupremote=true
push.default=upstream
push.followtags=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=https://github.com/Username/MyRepo.git
user.email=my_company_username@work.com
user.name=My Name
=== Git Attributes Information ===
git check_attr --all output
=== Our Modified Files Newline Normalisation and EOL Information ===
=== Our Modified Files Flag Information ===
Ignoring symlinks: 0
Hi @psclkhoury,
Thanks for sharing this - you can either:
store your credentials in the OSX Keychain and configure Git to use the OSX Keychain (git config --global credential.helper osxkeychain
)
use Git Credential Manager (see: https://docs.github.com/en/get-started/getting-started-with-git/caching-your-github-credentials-in-git)
Let me know if this works for you, or if you'd like additional information on configuring either of these options.
Kind regards, - Dylan from Sublime HQ
Everyday when I do a pull, Sublime merge asks me again to input my username and token. And then it will work until the next day. My token expiry is in 4 years.